From 3cae4d08ec1069201db641df16db6be7badd04b9 Mon Sep 17 00:00:00 2001 From: Thutmose Date: Fri, 26 Jun 2020 14:47:43 -0400 Subject: [PATCH] Updates forge version these changes will make the 1.16 update much smoother, as are also things changed there --- gradle.properties | 2 +- src/main/java/pokecube/adventures/PokecubeAdv.java | 4 ++-- src/main/java/pokecube/core/PokecubeCore.java | 4 ++-- .../core/client/gui/GuiChooseFirstPokemob.java | 1 - .../core/client/render/mobs/overlays/Health.java | 1 - src/main/java/pokecube/legends/PokecubeLegends.java | 13 +++++++------ src/main/java/pokecube/mobs/PokecubeMobs.java | 4 ++-- src/main/java/pokecube/nbtedit/NBTEdit.java | 4 ++-- src/main/java/thut/bling/ThutBling.java | 6 +++--- src/main/java/thut/core/common/ThutCore.java | 4 ++-- src/main/java/thut/crafts/ThutCrafts.java | 4 ++-- src/main/java/thut/wearables/ThutWearables.java | 4 ++-- .../java/thut/wearables/client/gui/GuiEvents.java | 7 ------- .../java/thut/wearables/impl/ConfigWearable.java | 1 - 14 files changed, 25 insertions(+), 34 deletions(-) diff --git a/gradle.properties b/gradle.properties index aaa5ac846f..54474aed1a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -version_forge=31.2.0 +version_forge=31.2.27 version_minecraft=1.15.2 version_mcsupport=[1.15.2] version_mappings=20200514-1.15.1 diff --git a/src/main/java/pokecube/adventures/PokecubeAdv.java b/src/main/java/pokecube/adventures/PokecubeAdv.java index 72c00ceb5e..83e12622d8 100644 --- a/src/main/java/pokecube/adventures/PokecubeAdv.java +++ b/src/main/java/pokecube/adventures/PokecubeAdv.java @@ -276,8 +276,8 @@ private static void init() public static final String TRAINERTEXTUREPATH = PokecubeAdv.MODID + ":textures/trainer/"; - public final static CommonProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public final static CommonProxy proxy = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); private static final String NETVERSION = "1.0.1"; // Handler for network stuff. diff --git a/src/main/java/pokecube/core/PokecubeCore.java b/src/main/java/pokecube/core/PokecubeCore.java index 4b74a3f08e..c5c07ab96d 100644 --- a/src/main/java/pokecube/core/PokecubeCore.java +++ b/src/main/java/pokecube/core/PokecubeCore.java @@ -339,8 +339,8 @@ public static void textureStitch(final TextureStitchEvent.Pre event) private static final Config config = new Config(); // Sided proxy for handling server/client only stuff. - public final static CommonProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public final static CommonProxy proxy = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); // Spawner for world spawning of pokemobs. public static SpawnHandler spawner = new SpawnHandler(); diff --git a/src/main/java/pokecube/core/client/gui/GuiChooseFirstPokemob.java b/src/main/java/pokecube/core/client/gui/GuiChooseFirstPokemob.java index 56ff9469a2..abc2fb7c42 100644 --- a/src/main/java/pokecube/core/client/gui/GuiChooseFirstPokemob.java +++ b/src/main/java/pokecube/core/client/gui/GuiChooseFirstPokemob.java @@ -244,7 +244,6 @@ public void render(final int i, final int j, final float f) GL11.glPopMatrix(); } - @SuppressWarnings("deprecation") public void renderItem(final double x, final double y, final double z) { final ItemStack item = PokecubeItems.POKECUBE_CUBES; diff --git a/src/main/java/pokecube/core/client/render/mobs/overlays/Health.java b/src/main/java/pokecube/core/client/render/mobs/overlays/Health.java index 668b3cac67..6b62465262 100644 --- a/src/main/java/pokecube/core/client/render/mobs/overlays/Health.java +++ b/src/main/java/pokecube/core/client/render/mobs/overlays/Health.java @@ -285,7 +285,6 @@ public static void renderHealthBar(final LivingEntity passedEntity, final Matrix mat.pop(); } - @SuppressWarnings("deprecation") public static void renderIcon(final LivingEntity mob, final MatrixStack mat, final IRenderTypeBuffer buf, final int vertexX, final int vertexY, final ItemStack stack, final int intU, final int intV, final int br) { diff --git a/src/main/java/pokecube/legends/PokecubeLegends.java b/src/main/java/pokecube/legends/PokecubeLegends.java index dff8076b99..eaf1de0311 100644 --- a/src/main/java/pokecube/legends/PokecubeLegends.java +++ b/src/main/java/pokecube/legends/PokecubeLegends.java @@ -63,8 +63,8 @@ public class PokecubeLegends { public static final Logger LOGGER = LogManager.getLogger(); - public static final DeferredRegister BLOCKS = new DeferredRegister<>(ForgeRegistries.BLOCKS, Reference.ID); - public static final DeferredRegister ITEMS = new DeferredRegister<>(ForgeRegistries.ITEMS, Reference.ID); + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Reference.ID); + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Reference.ID); @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = Reference.ID) public static class RegistryHandler @@ -109,8 +109,9 @@ public static void registerFeatures(final RegistryEvent.Register> eve .getDefaultState(), 5)).withPlacement(Placement.COUNT_RANGE.configure( new CountRangeConfig(2, 0, 0, 32)))); b.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.ORE.withConfiguration( - new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, BlockInit.SAPPHIRE_ORE.get() - .getDefaultState(), 5)).withPlacement(Placement.COUNT_RANGE.configure( + new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, BlockInit.SAPPHIRE_ORE + .get().getDefaultState(), 5)).withPlacement(Placement.COUNT_RANGE + .configure( new CountRangeConfig(2, 0, 0, 32)))); } @@ -137,8 +138,8 @@ public static void registerModDimensions(final RegistryEvent.Register () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public static CommonProxy proxy = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); public static final Config config = new Config(); diff --git a/src/main/java/pokecube/mobs/PokecubeMobs.java b/src/main/java/pokecube/mobs/PokecubeMobs.java index dd92d415b6..189e06d49e 100644 --- a/src/main/java/pokecube/mobs/PokecubeMobs.java +++ b/src/main/java/pokecube/mobs/PokecubeMobs.java @@ -87,8 +87,8 @@ public static void registerFeatures(final RegistryEvent.Register> eve } public static final String MODID = "pokecube_mobs"; - public static CommonProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public static CommonProxy proxy = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); Map genMap = Maps.newHashMap(); diff --git a/src/main/java/pokecube/nbtedit/NBTEdit.java b/src/main/java/pokecube/nbtedit/NBTEdit.java index 9c2626866d..3617236b60 100644 --- a/src/main/java/pokecube/nbtedit/NBTEdit.java +++ b/src/main/java/pokecube/nbtedit/NBTEdit.java @@ -56,8 +56,8 @@ public void onUpdated() public static boolean opOnly = true; - public final static CommonProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public final static CommonProxy proxy = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); public static final ConfigHolder config = new ConfigHolder(); diff --git a/src/main/java/thut/bling/ThutBling.java b/src/main/java/thut/bling/ThutBling.java index f5e483f367..a702f2088a 100644 --- a/src/main/java/thut/bling/ThutBling.java +++ b/src/main/java/thut/bling/ThutBling.java @@ -2,9 +2,9 @@ import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.gui.ScreenManager; import net.minecraft.client.gui.screen.inventory.ChestScreen; +import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.entity.LivingEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; @@ -37,8 +37,8 @@ public class ThutBling { public static final String MODID = "thut_bling"; - public static final CommonProxy PROXY = DistExecutor.runForDist(() -> () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public static final CommonProxy PROXY = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); public static class ClientProxy extends CommonProxy { diff --git a/src/main/java/thut/core/common/ThutCore.java b/src/main/java/thut/core/common/ThutCore.java index f99faecd3e..f181d2d549 100644 --- a/src/main/java/thut/core/common/ThutCore.java +++ b/src/main/java/thut/core/common/ThutCore.java @@ -153,8 +153,8 @@ public static void registerParticles(final RegistryEvent.Register () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public static final Proxy proxy = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); public static final ConfigHandler conf = new ConfigHandler(); diff --git a/src/main/java/thut/crafts/ThutCrafts.java b/src/main/java/thut/crafts/ThutCrafts.java index 438da1f925..839193f8af 100644 --- a/src/main/java/thut/crafts/ThutCrafts.java +++ b/src/main/java/thut/crafts/ThutCrafts.java @@ -70,8 +70,8 @@ public static void registerItems(final RegistryEvent.Register event) public final static PacketHandler packets = new PacketHandler(new ResourceLocation(Reference.MODID, "comms"), Reference.NETVERSION); - public static Proxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public static Proxy proxy = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); public static Item CRAFTMAKER; diff --git a/src/main/java/thut/wearables/ThutWearables.java b/src/main/java/thut/wearables/ThutWearables.java index 30d6efe8db..2d07a0d8e2 100644 --- a/src/main/java/thut/wearables/ThutWearables.java +++ b/src/main/java/thut/wearables/ThutWearables.java @@ -202,8 +202,8 @@ public static void textureStitch(final TextureStitchEvent.Pre event) public final static PacketHandler packets = new PacketHandler(new ResourceLocation(Reference.MODID, "comms"), Reference.NETVERSION); - public final static CommonProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), - () -> () -> new CommonProxy()); + public final static CommonProxy proxy = DistExecutor.safeRunForDist( + () -> ClientProxy::new, () -> CommonProxy::new); // Holder for our config options public static final Config config = new Config(); diff --git a/src/main/java/thut/wearables/client/gui/GuiEvents.java b/src/main/java/thut/wearables/client/gui/GuiEvents.java index 33df78b846..45b4e739be 100644 --- a/src/main/java/thut/wearables/client/gui/GuiEvents.java +++ b/src/main/java/thut/wearables/client/gui/GuiEvents.java @@ -37,13 +37,6 @@ public GuiEvents() { } - @OnlyIn(value = Dist.CLIENT) - @SubscribeEvent - public void guiPostAction(final GuiScreenEvent.ActionPerformedEvent.Post event) - { - System.out.println("test"); - } - @OnlyIn(value = Dist.CLIENT) @SubscribeEvent public void guiPostInit(final GuiScreenEvent.InitGuiEvent.Post event) diff --git a/src/main/java/thut/wearables/impl/ConfigWearable.java b/src/main/java/thut/wearables/impl/ConfigWearable.java index 4f0fe2b5b9..91435fc1d1 100644 --- a/src/main/java/thut/wearables/impl/ConfigWearable.java +++ b/src/main/java/thut/wearables/impl/ConfigWearable.java @@ -52,7 +52,6 @@ public EnumWearable getSlot(final ItemStack stack) return this.slot; } - @SuppressWarnings("deprecation") @OnlyIn(value = Dist.CLIENT) @Override public void renderWearable(final MatrixStack mat, final IRenderTypeBuffer buff, final EnumWearable slot,