LTCatt 6 лет назад
Родитель
Сommit
ca9aa9fc6c

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/EnchRebirth.java

@@ -1,6 +1,6 @@
 package com.hexdragon.enchrebirth;
 package com.hexdragon.enchrebirth;
 
 
-import com.hexdragon.enchrebirth.reg.Reg;
+import com.hexdragon.enchrebirth.reg.Registry;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -11,6 +11,6 @@ public class EnchRebirth {
 
 
     public EnchRebirth() {
     public EnchRebirth() {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
-        Reg.CONTAINERS.register(modEventBus);
+        Registry.CONTAINERS.register(modEventBus);
     }
     }
 }
 }

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/block/GrindstoneContainerRe.java

@@ -1,6 +1,6 @@
 package com.hexdragon.enchrebirth.block;
 package com.hexdragon.enchrebirth.block;
 
 
-import com.hexdragon.enchrebirth.reg.Reg;
+import com.hexdragon.enchrebirth.reg.Registry;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.Blocks;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -44,7 +44,7 @@ public class GrindstoneContainerRe extends Container {
     }
     }
 
 
     public GrindstoneContainerRe(int windowIdIn, PlayerInventory playerInventoryIn, final IWorldPosCallable worldPosCallableIn) {
     public GrindstoneContainerRe(int windowIdIn, PlayerInventory playerInventoryIn, final IWorldPosCallable worldPosCallableIn) {
-        super(Reg.containerGrindstone.get(), windowIdIn);
+        super(Registry.containerGrindstone.get(), windowIdIn);
         this.worldPosCallable = worldPosCallableIn;
         this.worldPosCallable = worldPosCallableIn;
         this.addSlot(new Slot(this.inputInventory, 0, 49, 19) {
         this.addSlot(new Slot(this.inputInventory, 0, 49, 19) {
             /**
             /**

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/reg/ScreenHandler.java → src/main/java/com/hexdragon/enchrebirth/reg/ClientSetupHandler.java

@@ -8,11 +8,11 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
 
 @Mod.EventBusSubscriber(modid = EnchRebirth.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 @Mod.EventBusSubscriber(modid = EnchRebirth.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
-public class ScreenHandler {
+public class ClientSetupHandler {
 
 
     @SubscribeEvent
     @SubscribeEvent
     public static void clientSetup(final FMLClientSetupEvent e) {
     public static void clientSetup(final FMLClientSetupEvent e) {
-        ScreenManager.registerFactory(Reg.containerGrindstone.get(), GrindstoneScreenRe::new);
+        ScreenManager.registerFactory(Registry.containerGrindstone.get(), GrindstoneScreenRe::new);
     }
     }
 
 
 }
 }

+ 2 - 10
src/main/java/com/hexdragon/enchrebirth/reg/Reg.java → src/main/java/com/hexdragon/enchrebirth/reg/Registry.java

@@ -10,18 +10,10 @@ import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.ForgeRegistries;
 
 
-public class Reg {
+public class Registry {
 
 
+    // 容器
     public static final DeferredRegister<ContainerType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, EnchRebirth.MODID);
     public static final DeferredRegister<ContainerType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, EnchRebirth.MODID);
     public static final RegistryObject<ContainerType<GrindstoneContainerRe>> containerGrindstone = CONTAINERS.register("grindstone", () -> IForgeContainerType.create((int windowId, PlayerInventory inv, PacketBuffer data) -> new GrindstoneContainerRe(windowId, inv)));
     public static final RegistryObject<ContainerType<GrindstoneContainerRe>> containerGrindstone = CONTAINERS.register("grindstone", () -> IForgeContainerType.create((int windowId, PlayerInventory inv, PacketBuffer data) -> new GrindstoneContainerRe(windowId, inv)));
 
 
-    // 物品
-    // public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, EnchRebirth.MODID);
-    // public static final RegistryObject<Item> itemOriginitePrime = ITEMS.register(OriginitePrime.name, OriginitePrime::new);
-
-    // 方块
-    // public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, EnchRebirth.MODID);
-    // public static final RegistryObject<Block> blockOriginitePrimeOre = BLOCKS.register(OriginitePrimeOre.name, OriginitePrimeOre::new);
-    // public static final RegistryObject<Item> itemOriginitePrimeOre = ITEMS.register(OriginitePrimeOre.name, OriginitePrimeOre.OriginitePrimeOreItem::new);
-
 }
 }