From 5797283ae37119f88fb03fd0819f3d6d02ad2170 Mon Sep 17 00:00:00 2001 From: TonimatasMC Date: Sat, 16 Jul 2022 07:21:17 +0200 Subject: [PATCH] Updated 41.0.33 to 41.0.94 --- gradle.properties | 2 +- .../krystalcraft/block/custom/CoalCombinerBlock.java | 2 +- .../tonimatasmc/krystalcraft/block/custom/CoalCrusherBlock.java | 2 +- .../krystalcraft/block/custom/GemCuttingStationBlock.java | 2 +- .../tonimatasmc/krystalcraft/block/entity/ModBlockEntities.java | 2 +- .../net/tonimatasmc/krystalcraft/datagen/DataGenerators.java | 2 +- .../net/tonimatasmc/krystalcraft/event/ModEventBusEvents.java | 2 +- .../java/net/tonimatasmc/krystalcraft/screen/ModMenuTypes.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index b0092d68..c9e89a84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false minecraft_version=1.19 -forge_version=41.0.33 +forge_version=41.0.94 forge_gradle=5.1.+ jei_version=jei-1.18.2-9.5.5.+ diff --git a/src/main/java/net/tonimatasmc/krystalcraft/block/custom/CoalCombinerBlock.java b/src/main/java/net/tonimatasmc/krystalcraft/block/custom/CoalCombinerBlock.java index 55139f98..10157e91 100644 --- a/src/main/java/net/tonimatasmc/krystalcraft/block/custom/CoalCombinerBlock.java +++ b/src/main/java/net/tonimatasmc/krystalcraft/block/custom/CoalCombinerBlock.java @@ -84,7 +84,7 @@ public void onRemove(BlockState pState, @Nullable Level pLevel, @Nullable BlockP BlockEntity entity = pLevel.getBlockEntity(Objects.requireNonNull(pPos)); if(entity instanceof CoalCombinerBlockEntity) { - NetworkHooks.openGui(((ServerPlayer) Objects.requireNonNull(pPlayer)), (CoalCombinerBlockEntity) entity, pPos); + NetworkHooks.openScreen(((ServerPlayer) Objects.requireNonNull(pPlayer)), (CoalCombinerBlockEntity) entity, pPos); } else { throw new IllegalStateException("Our Container provider is missing!"); } diff --git a/src/main/java/net/tonimatasmc/krystalcraft/block/custom/CoalCrusherBlock.java b/src/main/java/net/tonimatasmc/krystalcraft/block/custom/CoalCrusherBlock.java index f050dc20..f4edcb71 100644 --- a/src/main/java/net/tonimatasmc/krystalcraft/block/custom/CoalCrusherBlock.java +++ b/src/main/java/net/tonimatasmc/krystalcraft/block/custom/CoalCrusherBlock.java @@ -89,7 +89,7 @@ public InteractionResult use(@Nullable BlockState pState, Level pLevel, @Nullabl BlockEntity entity = pLevel.getBlockEntity(Objects.requireNonNull(pPos)); if(entity instanceof CoalCrusherBlockEntity) { - NetworkHooks.openGui(((ServerPlayer) Objects.requireNonNull(pPlayer)), (CoalCrusherBlockEntity)entity, pPos); + NetworkHooks.openScreen(((ServerPlayer) Objects.requireNonNull(pPlayer)), (CoalCrusherBlockEntity)entity, pPos); } else { throw new IllegalStateException("Our Container provider is missing!"); } diff --git a/src/main/java/net/tonimatasmc/krystalcraft/block/custom/GemCuttingStationBlock.java b/src/main/java/net/tonimatasmc/krystalcraft/block/custom/GemCuttingStationBlock.java index e12a9a84..2378bda9 100644 --- a/src/main/java/net/tonimatasmc/krystalcraft/block/custom/GemCuttingStationBlock.java +++ b/src/main/java/net/tonimatasmc/krystalcraft/block/custom/GemCuttingStationBlock.java @@ -89,7 +89,7 @@ public InteractionResult use(@Nullable BlockState pState, Level pLevel, @Nullabl BlockEntity entity = pLevel.getBlockEntity(Objects.requireNonNull(pPos)); if(entity instanceof GemCuttingStationBlockEntity) { - NetworkHooks.openGui(((ServerPlayer) Objects.requireNonNull(pPlayer)), (GemCuttingStationBlockEntity)entity, pPos); + NetworkHooks.openScreen(((ServerPlayer) Objects.requireNonNull(pPlayer)), (GemCuttingStationBlockEntity)entity, pPos); } else { throw new IllegalStateException("Our Container provider is missing!"); } diff --git a/src/main/java/net/tonimatasmc/krystalcraft/block/entity/ModBlockEntities.java b/src/main/java/net/tonimatasmc/krystalcraft/block/entity/ModBlockEntities.java index 00e1f6d6..4522514d 100644 --- a/src/main/java/net/tonimatasmc/krystalcraft/block/entity/ModBlockEntities.java +++ b/src/main/java/net/tonimatasmc/krystalcraft/block/entity/ModBlockEntities.java @@ -13,7 +13,7 @@ @SuppressWarnings("ConstantConditions") public class ModBlockEntities { - public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, KrystalCraft.MOD_ID); + public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, KrystalCraft.MOD_ID); public static final RegistryObject> GEM_CUTTING_STATION_BLOCK_ENTITY = BLOCK_ENTITIES.register("gem_cutting_station_block_entity", () -> diff --git a/src/main/java/net/tonimatasmc/krystalcraft/datagen/DataGenerators.java b/src/main/java/net/tonimatasmc/krystalcraft/datagen/DataGenerators.java index 0d72d4a2..f16f7176 100644 --- a/src/main/java/net/tonimatasmc/krystalcraft/datagen/DataGenerators.java +++ b/src/main/java/net/tonimatasmc/krystalcraft/datagen/DataGenerators.java @@ -2,9 +2,9 @@ import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import net.tonimatasmc.krystalcraft.KrystalCraft; @Mod.EventBusSubscriber(modid = KrystalCraft.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) diff --git a/src/main/java/net/tonimatasmc/krystalcraft/event/ModEventBusEvents.java b/src/main/java/net/tonimatasmc/krystalcraft/event/ModEventBusEvents.java index 40773c53..e9d3b022 100644 --- a/src/main/java/net/tonimatasmc/krystalcraft/event/ModEventBusEvents.java +++ b/src/main/java/net/tonimatasmc/krystalcraft/event/ModEventBusEvents.java @@ -13,7 +13,7 @@ public class ModEventBusEvents { @SubscribeEvent public static void registerModifierSerializers(@Nonnull final RegisterEvent event) { - event.register(ForgeRegistries.Keys.LOOT_MODIFIER_SERIALIZERS, helper -> { + event.register(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, helper -> { }); } } \ No newline at end of file diff --git a/src/main/java/net/tonimatasmc/krystalcraft/screen/ModMenuTypes.java b/src/main/java/net/tonimatasmc/krystalcraft/screen/ModMenuTypes.java index 2287c73a..db659517 100644 --- a/src/main/java/net/tonimatasmc/krystalcraft/screen/ModMenuTypes.java +++ b/src/main/java/net/tonimatasmc/krystalcraft/screen/ModMenuTypes.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable; public class ModMenuTypes { - public static final DeferredRegister> MENUS = DeferredRegister.create(ForgeRegistries.CONTAINERS, KrystalCraft.MOD_ID); + public static final DeferredRegister> MENUS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, KrystalCraft.MOD_ID); public static final RegistryObject> GEM_CUTTING_STATION_MENU = registerMenuType(GemCuttingStationMenu::new, "gem_cutting_station_menu"); public static final RegistryObject> COAL_CRUSHER_MENU = registerMenuType(CoalCrusherMenu::new, "coal_crusher_menu");