diff --git a/build.gradle.kts b/build.gradle.kts index 714d65f..acfc09a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,7 @@ apply { val mcVersion = "1.12.2" val forgeVersion = "14.23.5.2847" val mcFullVersion = "$mcVersion-$forgeVersion" -val modVersion = "0.2.0-beta" +val modVersion = "0.2.1-beta" version = "$mcVersion-$modVersion" group = "net.htmlcsjs.htmlTech" @@ -58,6 +58,9 @@ repositories { name = "tterrag maven" setUrl("https://maven.tterrag.com/") } + maven { + setUrl("https://cursemaven.com") + } maven { name = "CraftTweaker Maven" setUrl("https://maven.blamejared.com/") @@ -66,7 +69,7 @@ repositories { dependencies { "deobfCompile"("mezz.jei:jei_1.12.2:+") - "provided"(files("libs/gregtech-1.12.2-2.2.0-beta.jar")) + "deobfCompile"("curse.maven:ceu-557242:3784798") "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") diff --git a/libs/gregtech-1.12.2-2.2.0-beta.jar b/libs/gregtech-1.12.2-2.2.0-beta.jar deleted file mode 100644 index 9464a4c..0000000 Binary files a/libs/gregtech-1.12.2-2.2.0-beta.jar and /dev/null differ diff --git a/src/main/java/net/htmlcsjs/htmlTech/common/blocks/BlockHTCasing.java b/src/main/java/net/htmlcsjs/htmlTech/common/blocks/BlockHTCasing.java index 29ae806..9b03e5e 100644 --- a/src/main/java/net/htmlcsjs/htmlTech/common/blocks/BlockHTCasing.java +++ b/src/main/java/net/htmlcsjs/htmlTech/common/blocks/BlockHTCasing.java @@ -1,6 +1,6 @@ package net.htmlcsjs.htmlTech.common.blocks; -import gregtech.common.blocks.VariantBlock; +import gregtech.api.block.VariantBlock; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/net/htmlcsjs/htmlTech/common/laserpipe/net/LaserNetWalker.java b/src/main/java/net/htmlcsjs/htmlTech/common/laserpipe/net/LaserNetWalker.java index eb74055..82ddb45 100644 --- a/src/main/java/net/htmlcsjs/htmlTech/common/laserpipe/net/LaserNetWalker.java +++ b/src/main/java/net/htmlcsjs/htmlTech/common/laserpipe/net/LaserNetWalker.java @@ -32,7 +32,7 @@ public static List createNetData(World world, BlockPos sourcePip } @Override - protected PipeNetWalker createSubWalker(World world, BlockPos blockPos, int walkedBlocks) { + protected PipeNetWalker createSubWalker(World world, EnumFacing enumFacing, BlockPos blockPos, int walkedBlocks) { LaserNetWalker walker = new LaserNetWalker(world, blockPos, walkedBlocks, routes); walker.pipes = new HashSet<>(pipes); return walker; diff --git a/src/main/java/net/htmlcsjs/htmlTech/proxy/CommonProxy.java b/src/main/java/net/htmlcsjs/htmlTech/proxy/CommonProxy.java index 93644ce..fdfc757 100644 --- a/src/main/java/net/htmlcsjs/htmlTech/proxy/CommonProxy.java +++ b/src/main/java/net/htmlcsjs/htmlTech/proxy/CommonProxy.java @@ -1,7 +1,7 @@ package net.htmlcsjs.htmlTech.proxy; import gregtech.api.GregTechAPI; -import gregtech.common.blocks.VariantItemBlock; +import gregtech.api.block.VariantItemBlock; import net.htmlcsjs.htmlTech.HtmlTech; import net.htmlcsjs.htmlTech.api.HTValues; import net.htmlcsjs.htmlTech.api.unification.materials.HTMaterials; @@ -30,7 +30,6 @@ public void preLoad() { } public void init() { - } @SubscribeEvent