Skip to content

Create ja_jp.json #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 72 commits into
base: 1.20
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
68c68ae
initial 1.21 build setup
Ellpeck Sep 15, 2024
2e05cd7
bunch of work
Ellpeck Sep 15, 2024
bc71078
networking stuff
Ellpeck Sep 15, 2024
3e70470
some work on components
Ellpeck Sep 15, 2024
375f552
it compiles??
Ellpeck Sep 15, 2024
a8d1a99
made it run!
Ellpeck Sep 15, 2024
9f55e87
small fixes
Ellpeck Sep 15, 2024
4a43c32
fixes
Ellpeck Sep 15, 2024
f5894f4
removed fabric mod json
Ellpeck Sep 15, 2024
2597923
1.17.0
Ellpeck Sep 15, 2024
3fbcd8c
fixed crafting modules all sharing an inventory
Ellpeck Sep 27, 2024
c7f43c3
made crafting modules only request and deliver their own items
Ellpeck Sep 27, 2024
5b96a9d
allow shift clicking a ghost item to clear the entire crafting grid
Ellpeck Sep 27, 2024
861f219
fixed stack size modifier ui not updating correctly
Ellpeck Sep 27, 2024
69eb438
fixed mouse being centered when switching between pipe tabs
Ellpeck Sep 27, 2024
dfb73e9
1.17.1
Ellpeck Sep 27, 2024
653c629
fixed loot tables
Ellpeck Oct 20, 2024
a410e9c
1.17.2
Ellpeck Oct 20, 2024
f976936
allow crafters to work with the crafting module
Ellpeck Oct 25, 2024
c7d57c6
fixed the allow/disallow filter button not updating its tooltip immed…
Ellpeck Oct 25, 2024
de772c0
include crafting in redstone module use cases
Ellpeck Oct 25, 2024
3d5f592
1.18.0
Ellpeck Oct 25, 2024
4db5a5f
Disable drop shadow for pipe frames
fr3qu3ncy-dev Oct 27, 2024
955299f
Merge pull request #217 from fr3qu3ncy-dev/main
Ellpeck Nov 8, 2024
db97e2d
added publish task
Ellpeck Nov 22, 2024
e0e0b55
Merge remote-tracking branch 'origin/main'
Ellpeck Nov 22, 2024
09a471c
added a button to send craft items back
Ellpeck Nov 22, 2024
894fae6
1.18.1
Ellpeck Nov 22, 2024
f6ca929
store craft ingredient requests bundled together
Ellpeck Nov 27, 2024
24b1bbd
TODO for cleanup
Ellpeck Nov 27, 2024
e6e9d43
fix newly introduced oob
Ellpeck Nov 27, 2024
704027c
store active craft request data a lot more cleanly
Ellpeck Nov 27, 2024
2c8ab9e
fully deliver items of canceled crafting requests so that containers …
Ellpeck Nov 27, 2024
805393b
small refactor
Ellpeck Nov 27, 2024
0eb8740
pass active crafts when started
Ellpeck Nov 28, 2024
0942be0
mark crafting dependencies as in progress immediately so that they do…
Ellpeck Nov 28, 2024
1b0c36d
store active crafts globally in the network (and add a command to cle…
Ellpeck Nov 28, 2024
887bfed
allow force-canceling crafts that are in progress
Ellpeck Nov 28, 2024
9fc0c12
clean up the dump command's output
Ellpeck Nov 28, 2024
cee38be
1.19.0
Ellpeck Nov 28, 2024
c72d1cc
added a setting in the crafter to emit a redstone signal when all ite…
Ellpeck Nov 30, 2024
8894d1d
fixed shift-clicking *anywhere* clearing the crafting grid
Ellpeck Nov 30, 2024
4d0e484
use general capabilities when querying storage blocks, rather than ti…
Ellpeck Nov 30, 2024
eb15011
clean up some dead code
Ellpeck Nov 30, 2024
406e4a2
remove debug
Ellpeck Nov 30, 2024
474f072
fixed unrelated items arriving in the system tripping up running crafts
Ellpeck Nov 30, 2024
4a0cde4
use isEmpty properly
Ellpeck Nov 30, 2024
04f2bf3
made breaking pipes not use playerWillDestroy
Ellpeck Nov 30, 2024
f24423f
1.20.0
Ellpeck Dec 1, 2024
709cc5c
made the filter increase modifier have 27 slots instead of 18
Ellpeck Dec 3, 2024
7bd6bbc
fixed styling of the stack size modifier ui
Ellpeck Dec 3, 2024
21f2727
fixed requestExistingItem returning an incorrect amount of already re…
Ellpeck Dec 3, 2024
fb59109
fixed crafting requests always returning the full crafted items, rath…
Ellpeck Dec 3, 2024
af33933
make the jei crafting module transfer insert items in the order they …
Ellpeck Dec 3, 2024
8d1bd8f
fixed a cme when canceled crafts are removed
Ellpeck Dec 3, 2024
1d05d1c
fixed a kick when requesting an empty item
Ellpeck Dec 3, 2024
1d6272b
fixed recipes with crafting dependencies not waiting for them before …
Ellpeck Dec 3, 2024
b2630a1
1.20.1
Ellpeck Dec 3, 2024
c28100a
allow other crafts to happen while a craft is waiting to be able to i…
Ellpeck Dec 4, 2024
9aeb5d8
fixed recipes blocking each other by making dependencies not auto-del…
Ellpeck Dec 4, 2024
4a04535
oops
Ellpeck Dec 4, 2024
1e027ff
some additional profiling for crafting modules
Ellpeck Dec 4, 2024
af86cde
1.20.2
Ellpeck Dec 4, 2024
ddc5500
todo for CraftingModuleItem store
Ellpeck Dec 4, 2024
652b353
overhaul crafting module modes and add one that splits requests by cr…
Ellpeck Dec 4, 2024
4212b45
fixed extraneous crafts causing a kick
Ellpeck Dec 4, 2024
571b73c
don't allow items to be inserted into a terminal's return slots
Ellpeck Dec 4, 2024
e31889a
1.21.0
Ellpeck Dec 4, 2024
04baa95
clean up crafting module item requesting code
Ellpeck Dec 4, 2024
82a8853
only resolve network locks if the items actually changed
Ellpeck Dec 4, 2024
208667d
small fixes
Ellpeck Dec 5, 2024
d66347f
Add files via upload
suthibu Dec 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Clone repository
- name: Clone Repository
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
- name: Cache
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ hashFiles('**/build.gradle', '**/gradle-wrapper.properties') }}
key: ${{ hashFiles('**/build.gradle', '**/gradle-wrapper.properties', '**/gradle.properties') }}
- name: Build
run: |
chmod +x ./gradlew
Expand All @@ -25,4 +25,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: Mod Jar
path: build/libs/**.jar
path: build/libs/**.jar
39 changes: 39 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
on:
push:
tags: ["*"]
jobs:
release:
runs-on: ubuntu-latest
steps:
- name: Clone Repository
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
- name: Cache
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ hashFiles('**/build.gradle', '**/gradle-wrapper.properties', '**/gradle.properties') }}
- name: Grab Changelog from Commit Message Body
run: |
changelog=$(echo -e "$MESSAGE" | sed -n '/^$/,$p' | sed '1d')
echo -e "$changelog"
{
echo 'CHANGELOG<<EOF'
echo -e "$changelog"
echo EOF
} >> "$GITHUB_ENV"
env:
MESSAGE: ${{ github.event.head_commit.message }}
- name: Release
run: |
chmod +x ./gradlew
./gradlew publishMods --no-daemon
env:
MR_TOKEN: ${{ secrets.MR_TOKEN }}
CF_TOKEN: ${{ secrets.CF_TOKEN }}
57 changes: 50 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.neoforged.gradle.userdev' version '7.0.80'
id 'net.neoforged.gradle.userdev' version '7.0.163'
id 'me.modmuss50.mod-publish-plugin' version "0.7.4"
}

tasks.named('wrapper', Wrapper).configure {
// Define wrapper values here so as to not have to always do so when updating gradlew.properties.
// Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with
// documentation attached on cursor hover of gradle classes and methods. However, this comes with increased
// file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards.
// (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`)
distributionType = Wrapper.DistributionType.BIN
}

// Enable the Jar-in-Jar system for your mod
Expand All @@ -27,8 +37,8 @@ base {
archivesName = mod_name
}

// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
// Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21.
java.toolchain.languageVersion = JavaLanguageVersion.of(21)

println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
runs {
Expand Down Expand Up @@ -62,7 +72,7 @@ runs {

server {
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
programArgument '--nogui'
argument '--nogui'
}

// This run config launches GameTestServer and runs all registered gametests, then exits.
Expand All @@ -77,7 +87,7 @@ runs {
// workingDirectory project.file('run-data')

// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
arguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
}
}

Expand Down Expand Up @@ -127,8 +137,8 @@ tasks.withType(ProcessResources).configureEach {
]
inputs.properties replaceProperties

filesMatching(['META-INF/mods.toml']) {
expand replaceProperties + [project: project]
filesMatching(['META-INF/neoforge.mods.toml']) {
expand replaceProperties
}
}

Expand All @@ -154,3 +164,36 @@ publishing {
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
}

// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
idea {
module {
downloadSources = true
downloadJavadoc = true
}
}

publishMods {
def cfToken = providers.environmentVariable("CF_TOKEN")
def mrToken = providers.environmentVariable("MR_TOKEN")
dryRun = !cfToken.isPresent() || !mrToken.isPresent()
changelog = providers.environmentVariable("CHANGELOG").orElse("")
version = mod_version
type = me.modmuss50.mpp.ReleaseType.valueOf(mod_release_state)
file = tasks.jarJar.archiveFile
modLoaders.add("neoforge")

modrinth {
accessToken = mrToken
projectId = "XExdLWCQ"
minecraftVersions.add(minecraft_version)
optional("jei")
}

curseforge {
accessToken = cfToken
projectId = "376737"
minecraftVersions.add(minecraft_version)
optional("jei")
}
}
22 changes: 13 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
org.gradle.jvmargs=-Xmx1G
org.gradle.daemon=false
org.gradle.debug=false

#read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings
# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
neogradle.subsystems.parchment.minecraftVersion=1.20.3
neogradle.subsystems.parchment.mappingsVersion=2023.12.31
neogradle.subsystems.parchment.minecraftVersion=1.21
neogradle.subsystems.parchment.mappingsVersion=2024.07.28
# Environment Properties
# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
# The Minecraft version must agree with the Neo version to get a valid artifact
minecraft_version=1.20.4
minecraft_version_range=[1.20.4,1.21)
minecraft_version=1.21.1
minecraft_version_range=[1.21.1,1.22)
# The Neo version must agree with the Minecraft version to get a valid artifact
neo_version=20.4.195
neo_version=21.1.45
# The Neo version range can use any version of Neo as bounds
neo_version_range=[20.4,)
neo_version_range=[21.1.0,)
# The loader version range can only use the major version of FML as bounds
loader_version_range=[2,)
loader_version_range=[4,)

jei_version=17.3.0.49
jei_version=19.18.3.204
jgt_version=1.5.2
jheaps_version=0.14
apfloat_version=1.10.1
Expand All @@ -32,7 +34,9 @@ mod_name=PrettyPipes
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT
# The mod version. See https://semver.org/
mod_version=1.16.3
mod_version=1.21.0
# STABLE, BETA, ALPHA
mod_release_state=BETA
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
54 changes: 36 additions & 18 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand All @@ -32,10 +34,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions $var�, �${var}�, �${var:-default}�, �${var+SET},
# ${var#prefix}�, �${var%suffix}, and $( cmd );
# * compound commands having a testable exit status, especially case;
# * various built-in commands including command�, �set, and ulimit.
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
Expand All @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +82,12 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +134,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
Loading