update gregtech to 2.2.0

Author: htmlcsjs

build.gradle.kts

@@ -66,7 +66,7 @@ repositories {
 
 dependencies {
     "deobfCompile"("mezz.jei:jei_1.12.2:+")
-    "provided"(files("libs/gregtech-1.12.2-2.1.4-beta.jar"))
+    "provided"(files("libs/gregtech-1.12.2-2.2.0-beta.jar"))
     "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")

libs/gregtech-1.12.2-2.1.4-beta.jar libs/gregtech-1.12.2-2.2.0-beta.jarlibs/gregtech-1.12.2-2.1.4-beta.jar renamed to libs/gregtech-1.12.2-2.2.0-beta.jar

@@ -10,6 +10,7 @@
 import net.htmlcsjs.htmlTech.common.metatileentity.HTMetaTileEntities;
 import net.htmlcsjs.htmlTech.integration.theoneprobe.HTTOPCompatibility;
 import net.htmlcsjs.htmlTech.proxy.CommonProxy;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.SidedProxy;
@@ -46,7 +47,7 @@ public void init(FMLInitializationEvent event) {
 
         GTValues.HT = true;
 
-        if (GTValues.isModLoaded(HTValues.MODID_TOP)) {
+        if (Loader.isModLoaded(HTValues.MODID_TOP)) {
             logger.info("TheOneProbe found. Enabling integration...");
             HTTOPCompatibility.registerCompatibility();
         }

src/main/java/net/htmlcsjs/htmlTech/HtmlTech.java

@@ -9,6 +9,7 @@
 import gregtech.api.capability.impl.EnergyContainerList;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
+import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.pattern.BlockPattern;
@@ -97,7 +98,7 @@ public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) {
     }
 
     @Override
-    public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder metaTileEntityHolder) {
+    public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
         return new MetaTileEntityLaserCollector(this.metaTileEntityId);
     }
 

src/main/java/net/htmlcsjs/htmlTech/common/metatileentity/multiblock/MetaTileEntityLaserCollector.java

@@ -9,6 +9,7 @@
 import gregtech.api.capability.impl.EnergyContainerList;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
+import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.pattern.BlockPattern;
@@ -96,7 +97,7 @@ public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) {
     }
 
     @Override
-    public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder metaTileEntityHolder) {
+    public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
         return new MetaTileEntityLaserProjector(this.metaTileEntityId);
     }
 

src/main/java/net/htmlcsjs/htmlTech/common/metatileentity/multiblock/MetaTileEntityLaserProjector.java

@@ -10,6 +10,7 @@
 import gregtech.api.gui.widgets.SlotWidget;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
+import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart;
 import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.unification.material.Material;
@@ -52,7 +53,7 @@ public MetaTileEntityLaserHatch(ResourceLocation metaTileEntityId, int tier, boo
     }
 
     @Override
-    public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder metaTileEntityHolder) {
+    public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
         return new MetaTileEntityLaserHatch(this.metaTileEntityId, this.getTier(), this.isEmitter);
     }
 

src/main/java/net/htmlcsjs/htmlTech/common/metatileentity/multiblock/multiblockpart/MetaTileEntityLaserHatch.java

@@ -67,7 +67,7 @@ public static void init() {
         // Laser Emitter hatch
         ASSEMBLY_LINE_RECIPES.recipeBuilder()
                 .input(HULL[ZPM])
-                .input(circuit, MarkerMaterials.Tier.Master)
+                .input(circuit, MarkerMaterials.Tier.LuV)
                 .input(lens, Glass)
                 .input(wireFine, IndiumTinBariumTitaniumCuprate, 8)
                 .input(foil, Silver, 2)
@@ -84,10 +84,10 @@ public static void init() {
                 .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 64)
                 .input(EMITTER_ZPM, 2)
                 .input(plateDouble, Duranium)
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.ZPM)
+                .input(circuit, MarkerMaterials.Tier.ZPM)
+                .input(circuit, MarkerMaterials.Tier.ZPM)
+                .input(circuit, MarkerMaterials.Tier.ZPM)
                 .fluidInputs(SodiumPotassium.getFluid(1000))
                 .fluidInputs(SolderingAlloy.getFluid(L*7))
                 .output(LASER_PROJECTOR)
@@ -103,10 +103,10 @@ public static void init() {
                 .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 64)
                 .input(SENSOR_ZPM, 2)
                 .input(plateDouble, Europium)
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
-                .input(circuit, MarkerMaterials.Tier.Ultimate)
+                .input(circuit, MarkerMaterials.Tier.ZPM)
+                .input(circuit, MarkerMaterials.Tier.ZPM)
+                .input(circuit, MarkerMaterials.Tier.ZPM)
+                .input(circuit, MarkerMaterials.Tier.ZPM)
                 .fluidInputs(SodiumPotassium.getFluid(1000))
                 .fluidInputs(SolderingAlloy.getFluid(L*7))
                 .output(LASER_COLLECTOR)