From b3089942b8d2429492ad38e398c074aa0d0aa470 Mon Sep 17 00:00:00 2001 From: Augusto Resende Date: Mon, 26 Oct 2020 21:17:32 -0300 Subject: [PATCH] upgrade 1.16.3 and hotfix --- changelog.txt | 4 ++++ fabric/build.gradle | 3 ++- fabric/gradle.properties | 6 +++--- .../enhancedtotem/mixin/EnhancedTotemMixin.java | 2 +- .../witherrosesunpatch/mixin/EntityTypeMixin.java | 2 +- .../mixin/ZeroTickAbstractPlantPartBlock.java | 12 +----------- forge/gradle.properties | 8 ++++---- .../experience/forge/slimepatch/SlimePatch.java | 2 +- gradle.properties | 6 +++--- 9 files changed, 20 insertions(+), 25 deletions(-) diff --git a/changelog.txt b/changelog.txt index 806fa24..3ada483 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +This version (0.2.3) fix a weird bug that crashes on Fabric version, and upgrade everything to 1.16.3 (but it still works on older versions 1.16.x) + +=============================================================================== + This version (0.2.2) fix a bug when mod is trying to start in Forge Server. =============================================================================== diff --git a/fabric/build.gradle b/fabric/build.gradle index dc26db8..9c44165 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.4-SNAPSHOT' + id 'fabric-loom' version '0.5-SNAPSHOT' } sourceCompatibility = JavaVersion.VERSION_1_8 @@ -18,6 +18,7 @@ sourceSets { } } + archivesBaseName = project.hasProperty("outputJarBaseName") ? project.outputJarBaseName : "fabric" minecraft { diff --git a/fabric/gradle.properties b/fabric/gradle.properties index 88a4301..cefc48e 100644 --- a/fabric/gradle.properties +++ b/fabric/gradle.properties @@ -4,9 +4,9 @@ mod_id=vanillaexperience # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.2 - yarn_mappings=1.16.2+build.19 - loader_version=0.9.1+build.205 + minecraft_version=1.16.3 + yarn_mappings=1.16.3+build.47 + loader_version=0.10.5+build.213 # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api diff --git a/fabric/src/main/java/com/vanilla/experience/fabric/enhancedtotem/mixin/EnhancedTotemMixin.java b/fabric/src/main/java/com/vanilla/experience/fabric/enhancedtotem/mixin/EnhancedTotemMixin.java index 1b6e65c..69f903c 100644 --- a/fabric/src/main/java/com/vanilla/experience/fabric/enhancedtotem/mixin/EnhancedTotemMixin.java +++ b/fabric/src/main/java/com/vanilla/experience/fabric/enhancedtotem/mixin/EnhancedTotemMixin.java @@ -47,7 +47,7 @@ private void tryUseTotem(DamageSource source, CallbackInfoReturnable in player.clearStatusEffects(); player.addStatusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 900, 1)); player.addStatusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 100, 1)); - player.addStatusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 800, 2)); // 1.16.2 + player.addStatusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 800, 1)); player.world.sendEntityStatus(player, (byte)35); info.setReturnValue(true); diff --git a/fabric/src/main/java/com/vanilla/experience/fabric/witherrosesunpatch/mixin/EntityTypeMixin.java b/fabric/src/main/java/com/vanilla/experience/fabric/witherrosesunpatch/mixin/EntityTypeMixin.java index 3eb7508..b7c4c50 100644 --- a/fabric/src/main/java/com/vanilla/experience/fabric/witherrosesunpatch/mixin/EntityTypeMixin.java +++ b/fabric/src/main/java/com/vanilla/experience/fabric/witherrosesunpatch/mixin/EntityTypeMixin.java @@ -10,7 +10,7 @@ @Mixin(EntityType.class) public class EntityTypeMixin { - @Redirect(method = "method_29496", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z", ordinal = 2)) + @Redirect(method = "isInvalidSpawn(Lnet/minecraft/block/BlockState;)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z", ordinal = 2)) private boolean restoreWitherRoseSpawning(BlockState blockState, Block block) { return false; // return false to method that checks if is inside a Whiter Rose } diff --git a/fabric/src/main/java/com/vanilla/experience/fabric/zerotickunpatch/mixin/ZeroTickAbstractPlantPartBlock.java b/fabric/src/main/java/com/vanilla/experience/fabric/zerotickunpatch/mixin/ZeroTickAbstractPlantPartBlock.java index 2da1fd3..0617383 100644 --- a/fabric/src/main/java/com/vanilla/experience/fabric/zerotickunpatch/mixin/ZeroTickAbstractPlantPartBlock.java +++ b/fabric/src/main/java/com/vanilla/experience/fabric/zerotickunpatch/mixin/ZeroTickAbstractPlantPartBlock.java @@ -16,7 +16,7 @@ // this abstracts Kelp, TwistingVines and WeepingVines @Mixin(AbstractPlantPartBlock.class) -public class ZeroTickAbstractPlantPartBlock extends AbstractBlock { +public abstract class ZeroTickAbstractPlantPartBlock extends AbstractBlock { public ZeroTickAbstractPlantPartBlock(Settings settings) { super(settings); @@ -28,14 +28,4 @@ public void scheduledTick(final BlockState state, final ServerWorld world, final super.randomTick(state, world, pos, random); } } - - @Override - public Item asItem() { - return null; - } - - @Override - protected Block asBlock() { - return null; - } } \ No newline at end of file diff --git a/forge/gradle.properties b/forge/gradle.properties index c7f7240..eeccfaf 100644 --- a/forge/gradle.properties +++ b/forge/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false -mod_version=0.2.2 +mod_version=0.2.3 mod_id=vanillaexperience -mc_version=1.16.2 -forge_version=33.0.5 -forge_mappings=20200707-1.16.1 +mc_version=1.16.3 +forge_version=34.1.0 +forge_mappings=20200916-1.16.2 curseforge_id=393896 \ No newline at end of file diff --git a/forge/src/main/java/com/vanilla/experience/forge/slimepatch/SlimePatch.java b/forge/src/main/java/com/vanilla/experience/forge/slimepatch/SlimePatch.java index 96a2bb3..3c5629d 100644 --- a/forge/src/main/java/com/vanilla/experience/forge/slimepatch/SlimePatch.java +++ b/forge/src/main/java/com/vanilla/experience/forge/slimepatch/SlimePatch.java @@ -20,7 +20,7 @@ public void onWorldJoin(EntityJoinWorldEvent e) { World world = e.getWorld(); if(world instanceof ServerWorld) { ServerWorld serverworld = (ServerWorld)world; - if (serverworld.getServer().func_240793_aU_().func_230418_z_().func_236228_i_() && e.getEntity() instanceof net.minecraft.entity.monster.SlimeEntity) e.setCanceled(true); + if (serverworld.getServer().func_240793_aU_().getDimensionGeneratorSettings().func_236228_i_() && e.getEntity() instanceof net.minecraft.entity.monster.SlimeEntity) e.setCanceled(true); } } } diff --git a/gradle.properties b/gradle.properties index c5af65e..56d0482 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false -mod_version=0.2.2 +mod_version=0.2.3 mod_id=vanillaexperience -mc_version=1.16.2 -forge_version=33.0.5 +mc_version=1.16.3 +forge_version=34.1.0 curseforge_id=393896 \ No newline at end of file