Merge branch 'master' into GTHH-GregTech-2.8.10

Author: jude123412

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -1,7 +1,16 @@
 package gregtech.api.capability;
 
+import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
 public class GregtechDataCodes {
 
+    public static final int UPDATE_PRIVATE = assignId();
+    public static final int LOCK_FILL = assignId();
     private static int nextId = 0;
 
     public static int assignId() {
@@ -180,4 +189,36 @@ public static int assignId() {
     // ME Parts
     public static final int UPDATE_AUTO_PULL = assignId();
     public static final int UPDATE_ONLINE_STATUS = assignId();
+
+    // Everything below MUST be last in the class!
+    public static final Int2ObjectMap<String> NAMES = new Int2ObjectArrayMap<>();
+
+    static {
+        registerFields(GregtechDataCodes.class);
+    }
+
+    public static String getNameFor(int id) {
+        return NAMES.getOrDefault(id, "Unknown_DataCode:" + id);
+    }
+
+    /**
+     * Registers all fields from the passed in class to the name registry.
+     * Optionally, you can pass in a list of valid ids to check against so that errant ids are not added
+     * 
+     * @param clazz    Class to iterate fields
+     * @param validIds optional array of valid ids to check against class fields
+     */
+    public static void registerFields(Class<?> clazz, int... validIds) {
+        try {
+            for (Field field : clazz.getDeclaredFields()) {
+                if (field.getType() != Integer.TYPE) continue;
+                if (!Modifier.isStatic(field.getModifiers())) continue;
+                if (!Modifier.isFinal(field.getModifiers())) continue;
+                int id = field.getInt(null);
+                if (!ArrayUtils.isEmpty(validIds) && !ArrayUtils.contains(validIds, id))
+                    continue;
+                NAMES.put(id, field.getName() + ":" + id);
+            }
+        } catch (IllegalAccessException ignored) {}
+    }
 }

src/main/java/gregtech/api/cover/CoverSaveHandler.java

@@ -1,5 +1,6 @@
 package gregtech.api.cover;
 
+import gregtech.api.metatileentity.interfaces.ISyncedTileEntity;
 import gregtech.api.util.GTLog;
 
 import net.minecraft.nbt.NBTTagCompound;
@@ -66,6 +67,7 @@ public static void receiveInitialSyncData(@NotNull PacketBuffer buf, @NotNull Co
             } else {
                 Cover cover = definition.createCover(coverHolder, facing);
                 cover.readInitialSyncData(buf);
+                ISyncedTileEntity.checkInitialData(buf, cover);
                 coverHolder.addCover(facing, cover);
             }
         }
@@ -107,6 +109,7 @@ public static void readCoverPlacement(@NotNull PacketBuffer buf, @NotNull CoverH
             coverHolder.addCover(placementSide, cover);
 
             cover.readInitialSyncData(buf);
+            ISyncedTileEntity.checkInitialData(buf, cover);
         }
         coverHolder.scheduleRenderUpdate();
     }

src/main/java/gregtech/api/items/IDyeableItem.java

@@ -0,0 +1,79 @@
+package gregtech.api.items;
+
+import net.minecraft.block.BlockCauldron;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.Constants;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface IDyeableItem {
+
+    String COLOR_KEY = "gt_color";
+
+    default boolean hasColor(ItemStack stack) {
+        NBTTagCompound nbttagcompound = stack.getTagCompound();
+        return nbttagcompound != null && nbttagcompound.hasKey(COLOR_KEY, Constants.NBT.TAG_INT);
+    }
+
+    default int getColor(ItemStack stack) {
+        NBTTagCompound nbttagcompound = stack.getTagCompound();
+        if (nbttagcompound != null && nbttagcompound.hasKey(COLOR_KEY, Constants.NBT.TAG_INT)) {
+            return nbttagcompound.getInteger(COLOR_KEY);
+        }
+        return getDefaultColor(stack);
+    }
+
+    default int getDefaultColor(ItemStack stack) {
+        return 0xFFFFFF;
+    }
+
+    default void removeColor(ItemStack stack) {
+        NBTTagCompound nbttagcompound = stack.getTagCompound();
+        if (nbttagcompound != null && nbttagcompound.hasKey(COLOR_KEY)) {
+            nbttagcompound.removeTag(COLOR_KEY);
+        }
+    }
+
+    default void setColor(ItemStack stack, int color) {
+        NBTTagCompound nbttagcompound = stack.getTagCompound();
+        if (nbttagcompound == null) {
+            nbttagcompound = new NBTTagCompound();
+            stack.setTagCompound(nbttagcompound);
+        }
+        nbttagcompound.setInteger(COLOR_KEY, color);
+    }
+
+    default @NotNull EnumActionResult onItemUseFirst(@NotNull EntityPlayer player, @NotNull World world,
+                                                     @NotNull BlockPos pos, @NotNull EnumFacing side, float hitX,
+                                                     float hitY, float hitZ, @NotNull EnumHand hand) {
+        ItemStack stack = player.getHeldItem(hand);
+        if (this.hasColor(stack)) {
+            IBlockState iblockstate = world.getBlockState(pos);
+            if (iblockstate.getBlock() instanceof BlockCauldron cauldron) {
+                int water = iblockstate.getValue(BlockCauldron.LEVEL);
+                if (water > 0) {
+                    this.removeColor(stack);
+                    cauldron.setWaterLevel(world, pos, iblockstate, water - 1);
+                    return EnumActionResult.SUCCESS;
+                }
+            }
+        }
+        return EnumActionResult.PASS;
+    }
+
+    /**
+     * Controls whether the dyeing recipe simply removes the dyeable item from the crafting grid,
+     * or calls {@link net.minecraftforge.common.ForgeHooks#getContainerItem(ItemStack)} on it.
+     */
+    default boolean shouldGetContainerItem() {
+        return true;
+    }
+}