diff --git a/build.gradle b/build.gradle index 03d335b..0a9792b 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ dependencies { } forge "net.minecraftforge:forge:${project.forge_version}" - modImplementation "com.github.Mysticpasta1:mcef-forge:master-SNAPSHOT" + modImplementation "com.github.Mysticpasta1:mcef-forge:fb295e48d0" modImplementation "curse.maven:cloth_config_forge-348521:3546623" // Uncomment the following line to enable the deprecated Fabric API modules. // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. @@ -52,7 +52,7 @@ dependencies { loom { forge { mixinConfigs = [ - "webdisplays.mixins.json" + "webdisplays.mixin.json" ] } } diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java index 3189206..6b8ace1 100644 --- a/src/main/java/net/montoyo/wd/client/ClientProxy.java +++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java @@ -148,7 +148,7 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer throw new RuntimeException("MCEF is missing"); mcef.registerDisplayHandler(this); - mcef.registerJSQueryHandler(this); + // mcef.registerJSQueryHandler(this); //TODO why crashing on this method! findAdvancementToProgressField(); } diff --git a/src/main/java/net/montoyo/wd/config/ModConfig.java b/src/main/java/net/montoyo/wd/config/ModConfig.java index 6d2a9d9..67f5d4e 100644 --- a/src/main/java/net/montoyo/wd/config/ModConfig.java +++ b/src/main/java/net/montoyo/wd/config/ModConfig.java @@ -8,6 +8,7 @@ import net.montoyo.mcef.easy_forge_compat.Configuration; import java.util.List; +@Config(name = "webdisplays") public class ModConfig implements ConfigData { @ConfigEntry.Category("main") public Main main = new Main(); diff --git a/src/main/java/net/montoyo/wd/init/BlockInit.java b/src/main/java/net/montoyo/wd/init/BlockInit.java index 46189bd..3ce1611 100644 --- a/src/main/java/net/montoyo/wd/init/BlockInit.java +++ b/src/main/java/net/montoyo/wd/init/BlockInit.java @@ -1,10 +1,12 @@ package net.montoyo.wd.init; +import net.minecraft.core.Registry; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.RegistryObject; import net.montoyo.wd.block.BlockKeyboardRight; import net.montoyo.wd.block.BlockPeripheral; @@ -16,7 +18,7 @@ import java.util.function.Supplier; public class BlockInit { - public static DeferredRegister BLOCKS = DeferredRegister.create(Block.class, "webdisplays"); + public static DeferredRegister BLOCKS = DeferredRegister.create(Registry.BLOCK_REGISTRY, "webdisplays"); public static void init(IEventBus bus) { BLOCKS.register(bus); diff --git a/src/main/java/net/montoyo/wd/init/ItemInit.java b/src/main/java/net/montoyo/wd/init/ItemInit.java index 62dd2c8..3f36f4a 100644 --- a/src/main/java/net/montoyo/wd/init/ItemInit.java +++ b/src/main/java/net/montoyo/wd/init/ItemInit.java @@ -24,12 +24,12 @@ public class ItemInit { return register(id, c); } - public static final RegistryObject itemScreenCfg = register("itemScreenConfig", () -> new ItemScreenConfigurator(new Item.Properties())); - public static final RegistryObject itemOwnerThief = register("itemOwnerThief", () -> new ItemOwnershipThief(new Item.Properties())); - public static final RegistryObject itemLinker = register("itemLinker", () -> new ItemLinker(new Item.Properties())); - public static final RegistryObject itemMinePad = register("itemMinePad", () -> new ItemMinePad2(new Item.Properties())); - public static final RegistryObject itemUpgrade = register("itemUpgrade", ItemUpgrade::new); - public static final RegistryObject itemCraftComp = register("itemCraftComp", () -> new ItemCraftComponent(new Item.Properties())); - public static final RegistryObject itemLaserPointer = register("itemLaserPointer", () -> new ItemLaserPointer(new Item.Properties())); + public static final RegistryObject itemScreenCfg = register("item_screen_config", () -> new ItemScreenConfigurator(new Item.Properties())); + public static final RegistryObject itemOwnerThief = register("item_owner_thief", () -> new ItemOwnershipThief(new Item.Properties())); + public static final RegistryObject itemLinker = register("item_linker", () -> new ItemLinker(new Item.Properties())); + public static final RegistryObject itemMinePad = register("item_mine_pad", () -> new ItemMinePad2(new Item.Properties())); + public static final RegistryObject itemUpgrade = register("item_upgrade", ItemUpgrade::new); + public static final RegistryObject itemCraftComp = register("item_craftcomp", () -> new ItemCraftComponent(new Item.Properties())); + public static final RegistryObject itemLaserPointer = register("item_laserpointer", () -> new ItemLaserPointer(new Item.Properties())); } diff --git a/src/main/java/net/montoyo/wd/init/TileInit.java b/src/main/java/net/montoyo/wd/init/TileInit.java index 7162312..050d16b 100644 --- a/src/main/java/net/montoyo/wd/init/TileInit.java +++ b/src/main/java/net/montoyo/wd/init/TileInit.java @@ -7,6 +7,8 @@ import net.minecraftforge.registries.RegistryObject; import net.montoyo.wd.core.DefaultPeripheral; import net.montoyo.wd.entity.TileEntityScreen; +import java.util.Locale; + public class TileInit { public static final DeferredRegister> TILE_TYPES = DeferredRegister @@ -22,7 +24,7 @@ public class TileInit { public static void registerPeripherals() { for (DefaultPeripheral dp : DefaultPeripheral.values()) { if (dp.getTEClass() != null) - PERIPHERAL = TILE_TYPES.register(dp.name(), () -> BlockEntityType.Builder + PERIPHERAL = TILE_TYPES.register(dp.name().toLowerCase(Locale.ROOT), () -> BlockEntityType.Builder .of(dp.getTEClass(), BlockInit.blockPeripheral.get()).build(null)); }