Procházet zdrojové kódy

将 util 重命名为 corere(Core: Rebirth)

LTCatt před 6 roky
rodič
revize
d58f55ccef

+ 1 - 1
src/main/java/com/hexdragon/util/item/CraftResultInventoryRe.java → src/main/java/com/hexdragon/corere/item/CraftResultInventoryRe.java

@@ -1,4 +1,4 @@
-package com.hexdragon.util.item;
+package com.hexdragon.corere.item;
 
 import net.minecraft.inventory.CraftResultInventory;
 import net.minecraft.inventory.ItemStackHelper;

+ 1 - 1
src/main/java/com/hexdragon/util/item/EnchantmentHelperRe.java → src/main/java/com/hexdragon/corere/item/EnchantmentHelperRe.java

@@ -1,4 +1,4 @@
-package com.hexdragon.util.item;
+package com.hexdragon.corere.item;
 
 import com.sun.istack.internal.NotNull;
 import net.minecraft.enchantment.Enchantment;

+ 1 - 1
src/main/java/com/hexdragon/util/item/ItemHelperRe.java → src/main/java/com/hexdragon/corere/item/ItemHelperRe.java

@@ -1,4 +1,4 @@
-package com.hexdragon.util.item;
+package com.hexdragon.corere.item;
 
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.Item;

+ 4 - 4
src/main/java/com/hexdragon/util/network/PacketManager.java → src/main/java/com/hexdragon/corere/network/PacketManagerRe.java

@@ -1,4 +1,4 @@
-package com.hexdragon.util.network;
+package com.hexdragon.corere.network;
 
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;
@@ -7,7 +7,7 @@ import net.minecraftforge.fml.network.simple.SimpleChannel;
 
 import java.util.function.Function;
 
-public class PacketManager {
+public class PacketManagerRe {
 
     // 获取数据包的种类 ID
     private static int ID = 0;
@@ -16,11 +16,11 @@ public class PacketManager {
     // 创建 channel
     public static SimpleChannel channel;
     public static void create(String modid) {
-        PacketManager.channel = NetworkRegistry.newSimpleChannel(new ResourceLocation(modid + ":packets"), () -> "1.0", (s) -> true, (s) -> true);
+        PacketManagerRe.channel = NetworkRegistry.newSimpleChannel(new ResourceLocation(modid + ":packets"), () -> "1.0", (s) -> true, (s) -> true);
     }
 
     // 注册数据包
-    public static <T extends Packet> void registerPacket(Class<T> messageType, Function<PacketBuffer, T> decoder) {
+    public static <T extends PacketRe> void registerPacket(Class<T> messageType, Function<PacketBuffer, T> decoder) {
         channel.registerMessage(nextID(), messageType, T::encoder, decoder, T::onReceivePacket);
     }
 

+ 4 - 4
src/main/java/com/hexdragon/util/network/Packet.java → src/main/java/com/hexdragon/corere/network/PacketRe.java

@@ -1,4 +1,4 @@
-package com.hexdragon.util.network;
+package com.hexdragon.corere.network;
 
 import com.hexdragon.enchrebirth.Main;
 import net.minecraft.entity.player.ServerPlayerEntity;
@@ -10,7 +10,7 @@ import net.minecraftforge.fml.network.PacketDistributor;
 import javax.annotation.Nullable;
 import java.util.function.Supplier;
 
-public abstract class Packet {
+public abstract class PacketRe {
 
     // 编码方法(解码方法让子类自己写,Java 不允许 Override 一个 Static 方法)
     public abstract void encoder(PacketBuffer buf);
@@ -34,7 +34,7 @@ public abstract class Packet {
 
     // 将数据包发送至特定对象
     // 如果要扩展支持的对象范围,使用不同的 PacketDistributor 即可
-    public void sendToServer() {PacketManager.channel.sendToServer(this);}
-    public void sendToPlayer(ServerPlayerEntity player) {PacketManager.channel.send(PacketDistributor.PLAYER.with(() -> player), this); }
+    public void sendToServer() {PacketManagerRe.channel.sendToServer(this);}
+    public void sendToPlayer(ServerPlayerEntity player) {PacketManagerRe.channel.send(PacketDistributor.PLAYER.with(() -> player), this); }
 
 }

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

@@ -1,8 +1,8 @@
 package com.hexdragon.enchrebirth.block.anvil;
 
+import com.hexdragon.corere.item.EnchantmentHelperRe;
+import com.hexdragon.corere.item.ItemHelperRe;
 import com.hexdragon.enchrebirth.registry.RegMain;
-import com.hexdragon.util.item.EnchantmentHelperRe;
-import com.hexdragon.util.item.ItemHelperRe;
 import net.minecraft.block.AnvilBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.enchantment.Enchantment;

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

@@ -1,9 +1,9 @@
 package com.hexdragon.enchrebirth.block.grindstone;
 
+import com.hexdragon.corere.item.CraftResultInventoryRe;
+import com.hexdragon.corere.item.EnchantmentHelperRe;
+import com.hexdragon.corere.item.ItemHelperRe;
 import com.hexdragon.enchrebirth.registry.RegMain;
-import com.hexdragon.util.item.CraftResultInventoryRe;
-import com.hexdragon.util.item.EnchantmentHelperRe;
-import com.hexdragon.util.item.ItemHelperRe;
 import net.minecraft.block.Blocks;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;

+ 2 - 2
src/main/java/com/hexdragon/enchrebirth/item/name_tag/NameTagPacket.java

@@ -1,7 +1,7 @@
 package com.hexdragon.enchrebirth.item.name_tag;
 
+import com.hexdragon.corere.network.PacketRe;
 import com.hexdragon.enchrebirth.Main;
-import com.hexdragon.util.network.Packet;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -11,7 +11,7 @@ import net.minecraft.util.text.StringTextComponent;
 
 import javax.annotation.Nullable;
 
-public class NameTagPacket extends Packet {
+public class NameTagPacket extends PacketRe {
 
     // 数据包内容
     private final Hand hand; // 修改哪只手上的物品

+ 3 - 3
src/main/java/com/hexdragon/enchrebirth/registry/RegClient.java

@@ -1,11 +1,11 @@
 package com.hexdragon.enchrebirth.registry;
 
+import com.hexdragon.corere.network.PacketManagerRe;
 import com.hexdragon.enchrebirth.Main;
 import com.hexdragon.enchrebirth.block.anvil.AnvilRenderer;
 import com.hexdragon.enchrebirth.block.anvil.AnvilScreenRe;
 import com.hexdragon.enchrebirth.block.grindstone.GrindstoneScreenRe;
 import com.hexdragon.enchrebirth.item.name_tag.NameTagPacket;
-import com.hexdragon.util.network.PacketManager;
 import net.minecraft.client.gui.ScreenManager;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -36,8 +36,8 @@ public class RegClient {
 
     @SubscribeEvent public static void onCommonSetup(FMLCommonSetupEvent event) {
         // 注册数据包
-        PacketManager.create(Main.MODID);
-        PacketManager.registerPacket(NameTagPacket.class, NameTagPacket::decoder);
+        PacketManagerRe.create(Main.MODID);
+        PacketManagerRe.registerPacket(NameTagPacket.class, NameTagPacket::decoder);
     }
 
 }