Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
23d5509
wip 1.21.1
mrh0 Mar 19, 2025
34a11c9
port wip
mrh0 Mar 22, 2025
292e8c5
wip
mrh0 Mar 28, 2025
cd8b48d
port wip
mrh0 Mar 29, 2025
bb7baa7
wip porting
mrh0 Mar 30, 2025
0b5caec
wip porting
mrh0 Mar 30, 2025
ddf0c91
wip porting
mrh0 Apr 7, 2025
cd6c135
wip porting recipes
mrh0 Apr 9, 2025
dec43bf
typo was fixed upstream in BootstrapContext
piotrenewicz Apr 7, 2025
b6c12dd
port IClientItemExtensions
piotrenewicz Apr 7, 2025
91ddb30
IEnergyStorage migration was missed
piotrenewicz Apr 6, 2025
6c18886
distmarker migration was missed
piotrenewicz Apr 6, 2025
5d6de39
DeferredHolder .isPresent() method seems to be renamed to .isBound()
piotrenewicz Apr 7, 2025
a95515d
create.AllTags.forgeItemTag seems to be reimplemented as commonItemTag
piotrenewicz Apr 7, 2025
731a904
import mezz.jei.api ported from forge.ForgeTypes to neoforge.NeoForge…
piotrenewicz Apr 6, 2025
14537de
playerWillDestroy ported to playerDestroy
piotrenewicz Apr 6, 2025
d07f923
method names changed in VertexConsumer, ported WireNodeRenderer to us…
piotrenewicz Apr 7, 2025
481c0b3
fixed wrong number of arguments in CADisplaySources
piotrenewicz Apr 7, 2025
28574ba
wip processing recipes porting
mrh0 Apr 10, 2025
7fbeaa8
Added package-info.java to remove warnings.
L-Lawlite Apr 11, 2025
3c038b4
Added package-info.java to remove warnings.
L-Lawlite Apr 11, 2025
ba3fed7
Rarity is now an item property so there is no method for it
L-Lawlite Apr 11, 2025
49f16d9
Changed playerWillDestroy method signature to match super class
L-Lawlite Apr 11, 2025
7cfda68
Changed forge Capabilities to neoforge Capabilities in import
L-Lawlite Apr 11, 2025
3e8a818
Changed from forge tags to commonTags
L-Lawlite Apr 11, 2025
219be98
Changed the ResourceLocation builder to newer format
L-Lawlite Apr 11, 2025
dc4006d
Changed the ResourceLocation builder to newer format
L-Lawlite Apr 11, 2025
4a79d60
Added comments for questions
L-Lawlite Apr 11, 2025
d581e2c
Merge pull request #916 from piotrenewicz/1.21.1-piotrenewicz
mrh0 Apr 11, 2025
01a86f0
Added comments to remind the implementation changes
L-Lawlite Apr 11, 2025
c7df559
Energy Related changes
L-Lawlite Apr 11, 2025
ef85074
Removed old import
L-Lawlite Apr 11, 2025
1feb0f5
Merged with 1.21.1
L-Lawlite Apr 11, 2025
19bb92c
Merge pull request #920 from L-Lawlite/1.21.1
mrh0 Apr 11, 2025
b267a44
Readability changes
L-Lawlite Apr 11, 2025
c1648e9
Mixin fixes
L-Lawlite Apr 11, 2025
341e9e2
Merged 1
L-Lawlite Apr 11, 2025
3d442fd
removed peripheral stuff
mrh0 Apr 11, 2025
d347107
wip
mrh0 Apr 11, 2025
e63111b
Merge branch 'mrh0:1.21.1' into 1.21.1
L-Lawlite Apr 12, 2025
3719117
Recipe fixes
L-Lawlite Apr 12, 2025
91c5c17
Merged
L-Lawlite Apr 12, 2025
2f795d6
git removed error for rolling recipe
L-Lawlite Apr 12, 2025
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
25 changes: 25 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Build

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Setup JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Build with Gradle
run: ./gradlew build
382 changes: 172 additions & 210 deletions build.gradle

Large diffs are not rendered by default.

52 changes: 43 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,57 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true

minecraft_version = 1.20.1
forge_version = 47.3.0
minecraft_version=1.21.1

mod_version = 1.3.1

jei_minecraft_version = 1.20.1
jei_version = 15.20.0.106
jei_version=19.9.1.125

create_version = 6.0.3-71
ponder_version = 1.0.51
create_version = 6.0.3-46
ponder_version = 1.0.45
flywheel_version = 1.0.1
registrate_version = MC1.20-1.3.3
registrate_version = MC1.21-1.3.0+62

forgegradle_version = 6.0.6
mixingradle_version = 0.7-SNAPSHOT
mixin_version = 0.8.5
librarian_version = 1.+
parchment_version = 2023.06.26

cc_tweaked_enable = true
cc_tweaked_minecraft_version = 1.21.1
cc_tweaked_version = 1.114.2

#read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment
# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
parchment_minecraft_version=1.21.1
parchment_mappings_version=2024.11.17
# The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.21.1]
# The Neo version must agree with the Minecraft version to get a valid artifact
neo_version=21.1.136
# The Neo version range can use any version of Neo as bounds
neo_version_range=[21.1.136,)
# The loader version range can only use the major version of FML as bounds
loader_version_range=[1,)

## Mod Properties
mod_id=createadditon
# The human-readable display name for the mod.
mod_name=Create Crafts & Additions
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT License, Copyright 2025 MRH0
# The mod version. See https://semver.org/
# 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
mod_group_id=com-mrh0.createaddition
# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
mod_authors=MRH0

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.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
34 changes: 21 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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 Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/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 Down Expand Up @@ -83,10 +85,9 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# 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,26 +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=SC3045
# 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=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,11 +201,15 @@ 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" \
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down Expand Up @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
10 changes: 4 additions & 6 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
maven {
name = 'MinecraftForge'
url = 'https://maven.minecraftforge.net/'
}
maven { url = 'https://maven.neoforged.net/releases' }
}
}

plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
}
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
}
Loading
Loading