update gregtech to support 2.4.0

closes #5

Author: htmlcsjs

build.gradle.kts

@@ -69,7 +69,7 @@ repositories {
 
 dependencies {
     "deobfCompile"("mezz.jei:jei_1.12.2:+")
-    "deobfCompile"("curse.maven:ceu-557242:3784798")
+    "deobfCompile"("curse.maven:ceu-557242:3941501")
     "deobfCompile"("codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.358:universal")
     "deobfCompile"("codechicken:ChickenASM:1.12-1.0.2.9")
     "deobfCompile"("mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.23-16")

src/main/java/net/htmlcsjs/htmlTech/integration/theoneprobe/provider/LaserContainerInfoProvider.java

@@ -3,22 +3,25 @@
 import gregtech.api.capability.GregtechTileCapabilities;
 import gregtech.integration.theoneprobe.provider.CapabilityInfoProvider;
 import mcjty.theoneprobe.api.ElementAlignment;
+import mcjty.theoneprobe.api.IProbeHitData;
 import mcjty.theoneprobe.api.IProbeInfo;
 import mcjty.theoneprobe.api.TextStyleClass;
 import net.htmlcsjs.htmlTech.api.HTValues;
 import net.htmlcsjs.htmlTech.api.capability.HtmlTechCapabilities;
 import net.htmlcsjs.htmlTech.api.capability.ILaserContainer;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
 
+import javax.annotation.Nonnull;
+
 public class LaserContainerInfoProvider extends CapabilityInfoProvider<ILaserContainer> {
 
     @Override
+    @Nonnull
     protected Capability<ILaserContainer> getCapability() {
         return HtmlTechCapabilities.LASER_CONTAINER;
     }
-
     @Override
     public String getID() {
         return String.format("%s:laser_container_provider", HTValues.MODID);
@@ -30,12 +33,12 @@ protected boolean allowDisplaying(ILaserContainer capability) {
     }
 
     @Override
-    protected void addProbeInfo(ILaserContainer laserContainer, IProbeInfo probeInfo, TileEntity tileEntity, EnumFacing enumFacing) {
+    protected void addProbeInfo(ILaserContainer laserContainer, IProbeInfo probeInfo, EntityPlayer player, TileEntity tileEntity, IProbeHitData probeHitData) {
         long energyStored = laserContainer.getEnergyStored();
         long maxStorage = laserContainer.getEnergyCapacity();
         if (maxStorage == 0) return; //do not add empty max storage progress bar
         IProbeInfo horizontalPane = probeInfo.horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER));
-        String additionalSpacing = tileEntity.hasCapability(GregtechTileCapabilities.CAPABILITY_WORKABLE, enumFacing) ? "   " : "";
+        String additionalSpacing = tileEntity.hasCapability(GregtechTileCapabilities.CAPABILITY_WORKABLE, probeHitData.getSideHit()) ? "   " : "";
         horizontalPane.text(TextStyleClass.INFO + "{*gregtech.top.energy_stored*} " + additionalSpacing);
         horizontalPane.progress(energyStored, maxStorage, probeInfo.defaultProgressStyle()
                 .suffix("/" + maxStorage + " EU")