Re-add Towelette support, properly fix #53

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     java
     kotlin("jvm") version "1.3.60"
     idea
-    id("fabric-loom") version "0.2.6-SNAPSHOT"
+    id("fabric-loom") version "0.2.7-SNAPSHOT"
     `maven-publish`
     //id("com.github.johnrengelman.shadow") version "5.1.0"
 }
@@ -98,7 +98,8 @@ dependencies {
     includedMod("io.github.cottonmc:LibGui:" + v("libgui")) { isTransitive = false }
     includedMod("io.github.cottonmc:Jankson-Fabric:" + v("jankson")) { byeFabric() }
     includedMod("io.github.cottonmc", "LibCD", v("libcd")) { byeFabric(); exclude(module = "Jankson"); exclude(module = "nbt-crafting") }
-//    modCompileOnly("towelette:Towelette:" + v("towelette")) { byeFabric() }
+    modCompileOnly("towelette:Towelette:" + v("towelette")) { byeFabric() }
+    modRuntime("statement:Statement:" + v("statement")) { byeFabric() }
     modCompileOnly("io.github.prospector:modmenu:" + v("modmenu")) { byeFabric() }
 //    modCompileOnly("extra-pieces:extrapieces:" + v("extra-pieces"))
 //    modCompileOnly("com.github.artificemc:artifice:" + v("artifice"))
@@ -107,8 +108,8 @@ dependencies {
         modRuntime("com.terraformersmc", "traverse", v("traverse")) { byeFabric() }
         modRuntime("com.terraformersmc", "terrestria", v("terrestria")) { byeFabric() }
         modRuntime("me.shedaniel", "RoughlyEnoughItems", v("rei")) { exclude(module = "jankson"); byeFabric() }
-//        modRuntime("towelette:Towelette:" + v("towelette")) { byeFabric() }
-//        modRuntime("statement:Statement:" + v("statement")) { byeFabric() }
+        modRuntime("towelette:Towelette:" + v("towelette")) { byeFabric() }
+        modRuntime("statement:Statement:" + v("statement")) { byeFabric() }
         modRuntime("io.github.prospector:modmenu:" + v("modmenu")) { byeFabric() }
 //        modRuntime("extra-pieces:extrapieces:" + v("extra-pieces"))
 //        modRuntime("com.github.artificemc:artifice:" + v("artifice"))

gradle.properties

@@ -15,7 +15,7 @@ fabric-api = 0.4.24+build.279-1.15
 fabric-kotlin = 1.3.60+build.1
 
 # Mod dependencies
-towelette = 2.0.1+1.14.4
+towelette = 2.1.3+1.15
 libgui = 1.3.3-beta.7
 modmenu = 1.7.15-unstable.19w42a+build.11
 jankson = 2.0.1+j1.2.0
@@ -25,4 +25,4 @@ libcd = 1.6.2+1.15
 rei = 3.2.7-unstable.201911150440
 extra-pieces = 2.7.1
 artifice = 0.3.4
-statement = 1.0.0+1.14.4
+statement = 1.2.0+1.14.4

src/main/java/juuxel/adorn/mixin/fluidloggable/FluidUtilMixin.java

@@ -1,20 +1,20 @@
 package juuxel.adorn.mixin.fluidloggable;
 
 import juuxel.adorn.block.FluidUtil;
-//import net.minecraft.block.BlockState;
-//import net.minecraft.fluid.FluidState;
-//import net.minecraft.state.property.Properties;
-//import net.minecraft.util.registry.Registry;
+import net.minecraft.block.BlockState;
+import net.minecraft.fluid.FluidState;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.registry.Registry;
 import org.spongepowered.asm.mixin.Mixin;
-//import org.spongepowered.asm.mixin.injection.At;
-//import org.spongepowered.asm.mixin.injection.Inject;
-//import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-//import virtuoel.towelette.api.Fluidloggable;
-//import virtuoel.towelette.api.FluidProperties;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import virtuoel.towelette.api.Fluidloggable;
+import virtuoel.towelette.api.FluidProperties;
 
 @Mixin(FluidUtil.class)
 public class FluidUtilMixin {
-    /*@Inject(method = "updateFluidFromState", at = @At("RETURN"), cancellable = true, remap = false)
+    @Inject(method = "updateFluidFromState", at = @At("RETURN"), cancellable = true, remap = false)
     private static void onUpdateFluidFromState(BlockState state, FluidState fluidState, CallbackInfoReturnable<BlockState> info) {
         if (state.getBlock() instanceof Fluidloggable) {
             BlockState blockState = info.getReturnValue().with(FluidProperties.FLUID, Registry.FLUID.getId(fluidState.getFluid()));
@@ -29,5 +29,5 @@ private static void onUpdateFluidFromState(BlockState state, FluidState fluidSta
 
             info.setReturnValue(blockState);
         }
-    }*/
+    }
 }

src/main/java/juuxel/adorn/mixin/fluidloggable/FluidloggableMixin.java

@@ -2,7 +2,7 @@
 
 import juuxel.adorn.block.*;
 import org.spongepowered.asm.mixin.Mixin;
-//import virtuoel.towelette.api.Fluidloggable;
+import virtuoel.towelette.api.Fluidloggable;
 
 @Mixin({
         ChairBlock.class,
@@ -20,5 +20,5 @@
         TableLampBlock.class,
         TradingStationBlock.class
 })
-public class FluidloggableMixin /*implements Fluidloggable*/ {
+public class FluidloggableMixin implements Fluidloggable {
 }

src/main/resources/data/adorn/recipes/terrestria_hemlock_kitchen_sink.json

@@ -3,7 +3,7 @@
   "group": "adorn:kitchen_sink",
   "ingredients": [
     {
-      "tag": "adorn:terrestria_hemlock_kitchen_counter"
+      "item": "adorn:terrestria_hemlock_kitchen_counter"
     },
     {
       "item": "minecraft:bucket"

src/main/resources/data/adorn/recipes/terrestria_japanese_maple_kitchen_sink.json

@@ -3,7 +3,7 @@
   "group": "adorn:kitchen_sink",
   "ingredients": [
     {
-      "tag": "adorn:terrestria_japanese_maple_kitchen_counter"
+      "item": "adorn:terrestria_japanese_maple_kitchen_counter"
     },
     {
       "item": "minecraft:bucket"

src/main/resources/data/adorn/recipes/terrestria_rainbow_eucalyptus_kitchen_sink.json

@@ -3,7 +3,7 @@
   "group": "adorn:kitchen_sink",
   "ingredients": [
     {
-      "tag": "adorn:terrestria_rainbow_eucalyptus_kitchen_counter"
+      "item": "adorn:terrestria_rainbow_eucalyptus_kitchen_counter"
     },
     {
       "item": "minecraft:bucket"

src/main/resources/data/adorn/recipes/terrestria_redwood_kitchen_sink.json

@@ -3,7 +3,7 @@
   "group": "adorn:kitchen_sink",
   "ingredients": [
     {
-      "tag": "adorn:terrestria_redwood_kitchen_counter"
+      "item": "adorn:terrestria_redwood_kitchen_counter"
     },
     {
       "item": "minecraft:bucket"

src/main/resources/data/adorn/recipes/terrestria_rubber_kitchen_sink.json

@@ -3,7 +3,7 @@
   "group": "adorn:kitchen_sink",
   "ingredients": [
     {
-      "tag": "adorn:terrestria_rubber_kitchen_counter"
+      "item": "adorn:terrestria_rubber_kitchen_counter"
     },
     {
       "item": "minecraft:bucket"

src/main/resources/data/adorn/recipes/terrestria_sakura_kitchen_sink.json

@@ -3,7 +3,7 @@
   "group": "adorn:kitchen_sink",
   "ingredients": [
     {
-      "tag": "adorn:terrestria_sakura_kitchen_counter"
+      "item": "adorn:terrestria_sakura_kitchen_counter"
     },
     {
       "item": "minecraft:bucket"

src/main/resources/data/adorn/recipes/terrestria_willow_kitchen_sink.json

@@ -3,7 +3,7 @@
   "group": "adorn:kitchen_sink",
   "ingredients": [
     {
-      "tag": "adorn:terrestria_willow_kitchen_counter"
+      "item": "adorn:terrestria_willow_kitchen_counter"
     },
     {
       "item": "minecraft:bucket"

src/main/resources/data/adorn/recipes/traverse_fir_kitchen_sink.json

@@ -3,7 +3,7 @@
   "group": "adorn:kitchen_sink",
   "ingredients": [
     {
-      "tag": "adorn:traverse_fir_kitchen_counter"
+      "item": "adorn:traverse_fir_kitchen_counter"
     },
     {
       "item": "minecraft:bucket"