summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshartte <shartte@users.noreply.github.com>2023-12-05 08:32:49 +0100
committerGitHub <noreply@github.com>2023-12-05 08:32:49 +0100
commitd7c9899f0988a610b7e4c18e60b126495cdfa4ea (patch)
tree2ed908284daba019c161e97d2d3b32110e9c12c2
parent6a48e0669d910f4fa1f8ae4131564a7117e1f0db (diff)
Update to NeoForge 20.2 stable and newer NeoGradle (#21)
* Bump NeoGradle and remove 3G memory settings for Gradle, since the memory for decompilation is no longer inherited from Gradles memory settings since NeoGradle 7.0.56. * Bump NeoForge to stable for 1.20.2
-rw-r--r--build.gradle2
-rw-r--r--gradle.properties5
-rw-r--r--src/main/java/com/example/examplemod/ExampleMod.java6
3 files changed, 6 insertions, 7 deletions
diff --git a/build.gradle b/build.gradle
index 52af860..ffc7a0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
- id 'net.neoforged.gradle.userdev' version '7.0.55'
+ id 'net.neoforged.gradle.userdev' version '7.0.57'
}
version = mod_version
diff --git a/gradle.properties b/gradle.properties
index ff26558..5c20ccf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
# 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.jvmargs=
org.gradle.daemon=false
org.gradle.debug=false
@@ -13,7 +12,7 @@ minecraft_version=1.20.2
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.20.2,1.21)
# The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=20.2.59-beta
+neo_version=20.2.86
# The Neo version range can use any version of Neo as bounds or match the loader version range
neo_version_range=[20.2,)
# The loader version range can only use the major version of Neo/FML as bounds
diff --git a/src/main/java/com/example/examplemod/ExampleMod.java b/src/main/java/com/example/examplemod/ExampleMod.java
index e967e83..4f50275 100644
--- a/src/main/java/com/example/examplemod/ExampleMod.java
+++ b/src/main/java/com/example/examplemod/ExampleMod.java
@@ -46,12 +46,12 @@ public class ExampleMod
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);
// Creates a new Block with the id "examplemod:example_block", combining the namespace and path
- public static final DeferredBlock<Block> EXAMPLE_BLOCK = BLOCKS.registerBlock("example_block", BlockBehaviour.Properties.of().mapColor(MapColor.STONE));
+ public static final DeferredBlock<Block> EXAMPLE_BLOCK = BLOCKS.registerSimpleBlock("example_block", BlockBehaviour.Properties.of().mapColor(MapColor.STONE));
// Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
- public static final DeferredItem<BlockItem> EXAMPLE_BLOCK_ITEM = ITEMS.registerBlockItem("example_block", EXAMPLE_BLOCK);
+ public static final DeferredItem<BlockItem> EXAMPLE_BLOCK_ITEM = ITEMS.registerSimpleBlockItem("example_block", EXAMPLE_BLOCK);
// Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2
- public static final DeferredItem<Item> EXAMPLE_ITEM = ITEMS.registerItem("example_item", new Item.Properties().food(new FoodProperties.Builder()
+ public static final DeferredItem<Item> EXAMPLE_ITEM = ITEMS.registerSimpleItem("example_item", new Item.Properties().food(new FoodProperties.Builder()
.alwaysEat().nutrition(1).saturationMod(2f).build()));
// Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab