chore: updated to 1.18-rc.3

Slexom · Nov 27, 2021 · eefc5c8 · eefc5c8
1 parent 045025b
commit eefc5c8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,11 +31,11 @@ dependencies {
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
-    modApi("me.shedaniel.cloth:cloth-config-fabric:5.0.34") {
-        exclude(group: "net.fabricmc.fabric-api")
+    modApi("me.shedaniel.cloth:cloth-config-fabric:6.0.42") {
+        // exclude(group: "net.fabricmc.fabric-api")
     }
-    include("me.shedaniel.cloth:cloth-config-fabric:5.0.34")
-    modImplementation("com.terraformersmc:modmenu:2.0.0-beta.7")
+    include("me.shedaniel.cloth:cloth-config-fabric:6.0.42")
+    modImplementation("com.terraformersmc:modmenu:3.0.0")
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
     // You may need to force-disable transitiveness on them.
 }

diff --git a/gradle.properties b/gradle.properties
@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.18-pre5
-yarn_mappings=1.18-pre5+build.2
+minecraft_version=1.18-rc3
+yarn_mappings=1.18-rc3+build.1
 loader_version=0.12.5
 # Mod Properties
 mod_version=1.7.4
 maven_group=slexom.earthtojava
 archives_base_name=Earth2Java
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.42.8+1.18
+fabric_version=0.43.1+1.18
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/slexom/earthtojava/mobs/entity/passive/MelonGolemEntity.java b/src/main/java/slexom/earthtojava/mobs/entity/passive/MelonGolemEntity.java
@@ -87,20 +87,24 @@ public void tickMovement() {
             int i = MathHelper.floor(this.getX());
             int j = MathHelper.floor(this.getY());
             int k = MathHelper.floor(this.getZ());
+            BlockPos position = new BlockPos(i, j, k);
+
             if (this.isInsideWaterOrBubbleColumn()) {
                 this.damage(DamageSource.DROWN, 1.0F);
             }
-            if (this.world.getBiome(new BlockPos(i, 0, k)).getTemperature(new BlockPos(i, j, k)) > 1.0F) {
+
+            if (this.world.getBiome(position).isHot(position)) {
                 this.damage(DamageSource.ON_FIRE, 1.0F);
             }
+
             if (this.world.getGameRules().getBoolean(GameRules.DO_MOB_GRIEFING)) {
                 BlockState blockState = Blocks.SNOW.getDefaultState();
                 for (int l = 0; l < 4; ++l) {
                     i = MathHelper.floor(this.getX() + (double) ((float) (l % 2 * 2 - 1) * 0.25F));
                     j = MathHelper.floor(this.getY());
                     k = MathHelper.floor(this.getZ() + (double) ((float) (l / 2 % 2 * 2 - 1) * 0.25F));
                     BlockPos blockPos = new BlockPos(i, j, k);
-                    if (this.world.getBlockState(blockPos).isAir() && this.world.getBiome(blockPos).getTemperature(blockPos) < 0.8F && blockState.canPlaceAt(this.world, blockPos)) {
+                    if (this.world.getBlockState(blockPos).isAir() && blockState.canPlaceAt(this.world, blockPos)) {
                         this.world.setBlockState(blockPos, blockState);
                     }
                 }

diff --git a/src/main/resources/e2j.accesswidener b/src/main/resources/e2j.accesswidener
@@ -3,6 +3,5 @@ accessWidener v1 named
 accessible field net/minecraft/client/render/entity/model/ChickenEntityModel head Lnet/minecraft/client/model/ModelPart;
 
 accessible class net/minecraft/block/entity/BlockEntityType$BlockEntityFactory
-accessible class net/minecraft/world/gen/feature/ConfiguredFeatures$Decorators
 
 accessible method net/minecraft/block/FireBlock registerFlammableBlock (Lnet/minecraft/block/Block;II)V