Merge branch 'master' into fix/databank-working-fix

Author: WALHAY

dependencies.gradle

@@ -52,6 +52,8 @@ dependencies {
     compileOnly("curse.maven:journeymap-32274:5172461") // Journeymap 5.7.1p3
     compileOnly("curse.maven:voxelmap-225179:3029445") // VoxelMap 1.9.28
     compileOnly("curse.maven:xaeros-263420:5394758") // Xaero's Minimap 24.2.0
+    devOnlyNonPublishable rfg.deobf("curse.maven:ftb-library-legacy-forge-237167:2985811") // FTB Library 5.4.7.2
+    devOnlyNonPublishable rfg.deobf("curse.maven:ftb-utilities-forge-237102:3157548") // FTB Utilities 5.4.1.131
     compileOnly rfg.deobf("curse.maven:opencomputers-223008:5274236") // OpenComputers 1.8.5+179e1c3
     compileOnly rfg.deobf("curse.maven:hwyla-253449:2568751") // HWYLA 1.8.26-B41
     compileOnly rfg.deobf("curse.maven:baubles-227083:2518667") // Baubles 1.5.2

src/main/java/gregtech/api/block/IStateSoundType.java

@@ -0,0 +1,12 @@
+package gregtech.api.block;
+
+import net.minecraft.block.SoundType;
+import net.minecraft.block.state.IBlockState;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface IStateSoundType {
+
+    @NotNull
+    SoundType getSoundType(@NotNull IBlockState state);
+}

src/main/java/gregtech/api/block/VariantBlock.java

@@ -4,16 +4,19 @@
 import gregtech.common.creativetab.GTCreativeTabs;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -112,6 +115,16 @@ public int getMetaFromState(IBlockState state) {
         return state.getValue(VARIANT).ordinal();
     }
 
+    @NotNull
+    @Override
+    public SoundType getSoundType(@NotNull IBlockState state, @NotNull World world, @NotNull BlockPos pos,
+                                  @Nullable Entity entity) {
+        if (getState(state) instanceof IStateSoundType stateSoundType) {
+            return stateSoundType.getSoundType(state);
+        }
+        return super.getSoundType(state, world, pos, entity);
+    }
+
     // magic is here
     @SuppressWarnings("unchecked")
     protected static <T, R> Class<T> getActualTypeParameter(Class<? extends R> thisClass, Class<R> declaringClass) {

src/main/java/gregtech/api/block/machines/BlockMachine.java

@@ -590,4 +590,13 @@ public void randomDisplayTick(@NotNull IBlockState stateIn, @NotNull World world
         MetaTileEntity metaTileEntity = getMetaTileEntity(worldIn, pos);
         if (metaTileEntity != null) metaTileEntity.randomDisplayTick();
     }
+
+    @NotNull
+    @Override
+    public SoundType getSoundType(@NotNull IBlockState state, @NotNull World world, @NotNull BlockPos pos,
+                                  @Nullable Entity entity) {
+        MetaTileEntity metaTileEntity = getMetaTileEntity(world, pos);
+        if (metaTileEntity == null) return getSoundType();
+        return metaTileEntity.getSoundType();
+    }
 }

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

@@ -41,6 +41,7 @@
 import gregtech.common.items.MetaItems;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -908,6 +909,14 @@ private void updateSound() {
         }
     }
 
+    /**
+     * @return The sound type used when this block is broken, placed, stepped on, hit, or fallen on.
+     */
+    @NotNull
+    public SoundType getSoundType() {
+        return SoundType.METAL;
+    }
+
     public final @NotNull ItemStack getStackForm(int amount) {
         int metaTileEntityIntId = registry.getIdByObjectName(metaTileEntityId);
         return new ItemStack(registry.getBlock(), amount, metaTileEntityIntId);

src/main/java/gregtech/api/mui/sync/GTFluidSyncHandler.java

@@ -41,6 +41,7 @@ public class GTFluidSyncHandler extends SyncHandler {
     private final IFluidTank tank;
     private Consumer<FluidStack> jeiHandler;
     private BooleanConsumer lockHandler;
+    private BooleanSupplier isLocked;
     private Supplier<FluidStack> lockedFluid;
     private FluidStack lastFluid;
     private FluidStack phantomFluid;
@@ -50,15 +51,17 @@ public class GTFluidSyncHandler extends SyncHandler {
     private BooleanSupplier showAmountInTooltip = () -> true;
     private BooleanSupplier showAmountOnSlot = () -> true;
     private BooleanSupplier drawAlwaysFull = () -> true;
+    @Nullable
+    private Consumer<@Nullable FluidStack> changeConsumer;
 
     public GTFluidSyncHandler(IFluidTank tank) {
         this.tank = tank;
     }
 
     @Override
     public void detectAndSendChanges(boolean init) {
-        var current = getFluid();
-        if (init || current == null || lastFluid == null || current.isFluidEqual(lastFluid)) {
+        FluidStack current = getFluid();
+        if (init || !GTUtility.areFluidStacksEqual(current, lastFluid)) {
             lastFluid = current == null ? null : current.copy();
             syncToClient(UPDATE_TANK, buffer -> NetworkUtils.writeFluidStack(buffer, current));
         } else if (lastFluid != null && current.amount != lastFluid.amount) {
@@ -84,11 +87,13 @@ public void lockFluid(boolean locked, boolean sync) {
         });
     }
 
-    public GTFluidSyncHandler handleLocking(Supplier<FluidStack> lockedFluid, Consumer<FluidStack> jeiHandler,
-                                            BooleanConsumer lockHandler) {
+    public GTFluidSyncHandler handleLocking(@NotNull Supplier<FluidStack> lockedFluid,
+                                            @NotNull Consumer<FluidStack> jeiHandler,
+                                            @NotNull BooleanConsumer lockHandler, @NotNull BooleanSupplier isLocked) {
         this.lockedFluid = lockedFluid;
         this.jeiHandler = jeiHandler;
         this.lockHandler = lockHandler;
+        this.isLocked = isLocked;
         return this;
     }
 
@@ -194,6 +199,16 @@ public boolean drawAlwaysFull() {
         return this.drawAlwaysFull.getAsBoolean();
     }
 
+    public void setChangeConsumer(@Nullable Consumer<@Nullable FluidStack> changeConsumer) {
+        this.changeConsumer = changeConsumer;
+    }
+
+    protected void onChange(@Nullable FluidStack fluidStack) {
+        if (changeConsumer != null) {
+            changeConsumer.accept(fluidStack);
+        }
+    }
+
     public @NotNull String getFormattedFluidAmount() {
         var tankFluid = this.tank.getFluid();
         return String.format("%,d", tankFluid == null ? 0 : tankFluid.amount);
@@ -206,22 +221,25 @@ public int getFluidAmount() {
 
     public @Nullable String getFluidLocalizedName() {
         var tankFluid = this.tank.getFluid();
-        if (tankFluid == null && canLockFluid())
-            tankFluid = this.lockedFluid.get();
+        if (tankFluid == null)
+            tankFluid = getLockedFluid();
 
         return tankFluid == null ? null : tankFluid.getLocalizedName();
     }
 
     public @NotNull IKey getFluidNameKey() {
         FluidStack tankFluid = tank.getFluid();
-        if (tankFluid == null && canLockFluid()) {
-            tankFluid = lockedFluid.get();
+        if (tankFluid == null) {
+            tankFluid = getLockedFluid();
         }
         return tankFluid == null ? IKey.EMPTY : KeyUtil.fluid(tankFluid);
     }
 
     public void handleTooltip(@NotNull RichTooltip tooltip) {
-        tooltip.addLine(getFluidNameKey());
+        IKey nameKey = getFluidNameKey();
+        if (nameKey != IKey.EMPTY) {
+            tooltip.addLine(nameKey);
+        }
 
         if (showAmountInTooltip()) {
             tooltip.addLine(IKey.lang("gregtech.fluid.amount", getFluidAmount(), getCapacity()));
@@ -249,9 +267,20 @@ public void handleTooltip(@NotNull RichTooltip tooltip) {
     public void readOnClient(int id, PacketBuffer buf) {
         switch (id) {
             case TRY_CLICK_CONTAINER -> replaceCursorItemStack(NetworkUtils.readItemStack(buf));
-            case UPDATE_TANK -> setFluid(NetworkUtils.readFluidStack(buf));
-            case UPDATE_AMOUNT -> setAmount(buf.readInt());
-            case LOCK_FLUID -> lockFluid(NetworkUtils.readFluidStack(buf), false);
+            case UPDATE_TANK -> {
+                FluidStack stack = NetworkUtils.readFluidStack(buf);
+                setFluid(stack);
+                onChange(stack);
+            }
+            case UPDATE_AMOUNT -> {
+                setAmount(buf.readInt());
+                onChange(getFluid());
+            }
+            case LOCK_FLUID -> {
+                lockFluid(NetworkUtils.readFluidStack(buf), false);
+                FluidStack stack = getFluid();
+                onChange(stack == null ? getLockedFluid() : stack);
+            }
         }
     }
 
@@ -545,7 +574,7 @@ public FluidStack getLockedFluid() {
     }
 
     public boolean canLockFluid() {
-        return jeiHandler != null && lockHandler != null && lockedFluid != null;
+        return jeiHandler != null && lockHandler != null && lockedFluid != null && isLocked != null;
     }
 
     public void toggleLockFluid() {

src/main/java/gregtech/api/pipenet/block/BlockPipe.java

@@ -134,6 +134,15 @@ public static Cuboid6 getCoverSideBox(EnumFacing side, float thickness) {
 
     public abstract ItemStack getDropItem(IPipeTile<PipeType, NodeDataType> pipeTile);
 
+    @NotNull
+    @Override
+    @SuppressWarnings({ "deprecation", "unchecked" })
+    public ItemStack getItem(@NotNull World world, @NotNull BlockPos pos, @NotNull IBlockState state) {
+        var te = world.getTileEntity(pos);
+        if (!(te instanceof IPipeTile<?, ?>pipeTile)) return ItemStack.EMPTY;
+        return getDropItem((IPipeTile<PipeType, NodeDataType>) pipeTile);
+    }
+
     protected abstract NodeDataType getFallbackType();
 
     // TODO this has no reason to need an ItemStack parameter

src/main/java/gregtech/api/util/GTUtility.java

@@ -1023,4 +1023,10 @@ public static int combineRGB(@Range(from = 0, to = 255) int r, @Range(from = 0,
         }
         return map.get(key.toWildcard());
     }
+
+    public static boolean areFluidStacksEqual(@Nullable FluidStack a, @Nullable FluidStack b) {
+        if (a == b) return true;
+        if (a == null) return false;
+        return a.isFluidEqual(b);
+    }
 }

src/main/java/gregtech/api/util/GregFakePlayer.java

@@ -11,32 +11,51 @@
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.common.util.FakePlayerFactory;
 import net.minecraftforge.common.util.ITeleporter;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 
 import com.mojang.authlib.GameProfile;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.ref.WeakReference;
+import java.util.Map;
 import java.util.UUID;
 
 public class GregFakePlayer extends EntityPlayer {
 
-    private static final GameProfile GREGTECH = new GameProfile(UUID.fromString("518FDF18-EC2A-4322-832A-58ED1721309B"),
-            "[GregTech]");
-    private static WeakReference<FakePlayer> GREGTECH_PLAYER = null;
+    private static final String FAKE_NAME = "[GregTech]";
+    private static final UUID FAKE_UUID = UUID.fromString("518FDF18-EC2A-4322-832A-58ED1721309B");
+    private static final GameProfile FAKE_PROFILE = new GameProfile(FAKE_UUID, FAKE_NAME);
+    private static final Map<UUID, GameProfile> PROFILE_CACHE = new Object2ObjectOpenHashMap<>();
+    private static final Map<UUID, WeakReference<FakePlayer>> GREGTECH_PLAYERS = new Object2ObjectOpenHashMap<>();
 
-    public static FakePlayer get(WorldServer world) {
-        FakePlayer ret = GREGTECH_PLAYER != null ? GREGTECH_PLAYER.get() : null;
-        if (ret == null) {
-            ret = FakePlayerFactory.get(world, GREGTECH);
-            GREGTECH_PLAYER = new WeakReference<>(ret);
+    public static @NotNull FakePlayer get(@NotNull WorldServer world) {
+        return get(world, FAKE_PROFILE);
+    }
+
+    public static @NotNull FakePlayer get(@NotNull WorldServer world, @Nullable UUID fakePlayerUUID) {
+        return get(world, fakePlayerUUID == null ? FAKE_PROFILE :
+                PROFILE_CACHE.computeIfAbsent(fakePlayerUUID, id -> new GameProfile(id, FAKE_NAME)));
+    }
+
+    public static @NotNull FakePlayer get(@NotNull WorldServer world, @NotNull GameProfile fakePlayerProfile) {
+        UUID id = fakePlayerProfile.getId();
+        if (GREGTECH_PLAYERS.containsKey(id)) {
+            FakePlayer fakePlayer = GREGTECH_PLAYERS.get(id).get();
+            if (fakePlayer != null) {
+                return fakePlayer;
+            }
         }
-        return ret;
+
+        FakePlayer fakePlayer = new FakePlayer(world, fakePlayerProfile);
+        GREGTECH_PLAYERS.put(id, new WeakReference<>(fakePlayer));
+        return fakePlayer;
     }
 
-    public GregFakePlayer(World worldIn) {
-        super(worldIn, GREGTECH);
+    public GregFakePlayer(@NotNull World worldIn) {
+        super(worldIn, FAKE_PROFILE);
     }
 
     @Override

src/main/java/gregtech/api/util/JEIUtil.java

@@ -0,0 +1,29 @@
+package gregtech.api.util;
+
+import net.minecraft.enchantment.EnchantmentData;
+
+import com.cleanroommc.modularui.integration.jei.JeiGhostIngredientSlot;
+import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
+import mezz.jei.Internal;
+
+public class JEIUtil {
+
+    /**
+     * Check if the player is currently hovering over a valid ingredient for this slot. <br/>
+     * Will always return false is JEI is not installed.
+     */
+    public static boolean hoveringOverIngredient(JeiGhostIngredientSlot<?> jeiGhostIngredientSlot) {
+        if (!Mods.JustEnoughItems.isModLoaded()) return false;
+        return ModularUIJeiPlugin.hoveringOverIngredient(jeiGhostIngredientSlot);
+    }
+
+    public static Object getBookStackIfEnchantment(Object ingredient) {
+        if (ingredient instanceof EnchantmentData enchantmentData) {
+            return Internal.getIngredientRegistry()
+                    .getIngredientHelper(enchantmentData)
+                    .getCheatItemStack(enchantmentData);
+        }
+
+        return ingredient;
+    }
+}