diff --git a/build.gradle b/build.gradle index a1af13b..a3aadb6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.2.2-SNAPSHOT' + id 'fabric-loom' version '0.2.3-SNAPSHOT' } sourceCompatibility = 1.8 @@ -32,14 +32,14 @@ dependencies { compileOnly "com.google.code.findbugs:jsr305:3.0.2" // javax.annotations.* - modCompile ("alexiil.mc.lib:libblockattributes:0.4.2") { transitive = false } - modCompile ("io.github.cottonmc:cotton:0.7.3+1.14.2-SNAPSHOT") { transitive = false } - modCompile ("io.github.cottonmc:cotton-energy:1.4.0+1.14.2-SNAPSHOT") { transitive = false } - modCompile ("io.github.cottonmc:cotton-resources:1.2.0+1.14.2-SNAPSHOT") { transitive = false } + modCompile ("alexiil.mc.lib:libblockattributes:0.4.2") + modCompile ("io.github.cottonmc:cotton:0.7.5+1.14.2-SNAPSHOT") + modCompile ("io.github.cottonmc:cotton-energy:1.4.0+1.14.2-SNAPSHOT") + modCompile ("io.github.cottonmc:cotton-resources:1.2.0+1.14.2-SNAPSHOT") modCompile "me.shedaniel:RoughlyEnoughItems:2.9.1+build.116" - include ("alexill.mc.lib:libblockattributes:0.4.2") { transitive = false } - include ("io.github.cottonmc:cotton-energy:1.4.0") { transitive = false } + include ("alexill.mc.lib:libblockattributes:0.4.2") + include ("io.github.cottonmc:cotton-energy:1.4.0+1.14.2") } processResources { diff --git a/src/main/java/vivatech/controller/CrusherController.java b/src/main/java/vivatech/controller/CrusherController.java index 90c06fb..8077c31 100644 --- a/src/main/java/vivatech/controller/CrusherController.java +++ b/src/main/java/vivatech/controller/CrusherController.java @@ -11,12 +11,13 @@ import net.minecraft.util.Identifier; import vivatech.Vivatech; import vivatech.VivatechClient; +import vivatech.init.VivatechRecipes; import vivatech.util.StringHelper; public class CrusherController extends CottonScreenController { public CrusherController(int syncId, PlayerInventory playerInventory, BlockContext context) { - super(CottonRecipes.CRUSHING_RECIPE, syncId, playerInventory, getBlockInventory(context), getBlockPropertyDelegate(context)); + super(VivatechRecipes.CRUSHING, syncId, playerInventory, getBlockInventory(context), getBlockPropertyDelegate(context)); WPlainPanel root = new WPlainPanel(); ((WGridPanel) getRootPanel()).add(root, 0, 0); diff --git a/src/main/java/vivatech/init/VivatechBlocks.java b/src/main/java/vivatech/init/VivatechBlocks.java index a5277dc..fcb3395 100644 --- a/src/main/java/vivatech/init/VivatechBlocks.java +++ b/src/main/java/vivatech/init/VivatechBlocks.java @@ -1,6 +1,5 @@ package vivatech.init; - import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.util.Identifier;