Fixes and a tweak for MrCrayfish's Furniture Mod

Author: jss2a98aj

dependencies.gradle

@@ -9,13 +9,17 @@ def deobfCurse(String mavenDep) {
 }
 
 dependencies {
-    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
+    runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
 
-    compile deobfCurse("witchery-69673:2234410")
-    compile deobfCurse("ganys-surface-222303:2284819")
-    compile deobfCurse("gilded-games-util-228114:2273362")
-    compile deobfCurse("aether-ii-223796:2273367")
-    compile deobfCurse("pams-temperate-plants-221916:2206430")
-    compile deobfCurse("village-names-259230:4328516")
-    compile deobfCurse("llibrary-243298:2319767")
+    implementation("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
+    implementation deobfCurse("witchery-69673:2234410")
+    implementation deobfCurse("village-names-259230:4328516")
+
+    compileOnly deobfCurse("gilded-games-util-228114:2273362")
+    compileOnly deobfCurse("aether-ii-223796:2273367")
+
+    compileOnly deobfCurse("ganys-surface-222303:2284819")
+    compileOnly deobfCurse("pams-temperate-plants-221916:2206430")
+    compileOnly deobfCurse("llibrary-243298:2319767")
+    compileOnly deobfCurse("mrcrayfish-furniture-mod-55438:2221679")
 }

src/main/java/jss/bugtorch/config/BugTorchConfig.java

@@ -101,6 +101,7 @@ public class BugTorchConfig {
 	public static float scaledWitherDamageMaxHealthMult;
 
 	//Mixin mod bugfixes
+	public static boolean fixCrayfishFurnitureNullPointerException;
 	public static boolean fixGanysSurfaceOpenTrapdoorBackTexture;
 	public static boolean fixThaumcraftCandleColorArrayOutOfBounds;
 	public static boolean fixWitcheryGarlicGarlandBlockBounds;
@@ -109,6 +110,7 @@ public class BugTorchConfig {
 	public static boolean reuseAetherIIRenderPlayer;
 
 	//Mixin mod tweaks
+	public static boolean disableCrayfishFurnitureAchievements;
 	public static boolean proxyLLibraryPastebin;
 
 	//Category names
@@ -270,6 +272,7 @@ public static void loadModdedMixinConfig(File configFile) {
 		Configuration config = new Configuration(configFile);
 
 		//Bugfixes
+		fixCrayfishFurnitureNullPointerException = config.getBoolean("fixCrayfishFurnitureNullPointerExceptions", categoryBugfixes, true, "Makes several TEs from MrCrayfish's Furniture Mod implement ISidedInventory correctly.");
 		fixGanysSurfaceOpenTrapdoorBackTexture = config.getBoolean("fixGanysSurfaceOpenTrapdoorBackTexture", categoryBugfixes, true, "Makes Gany's Surface trapdoors use the correct back texture when open.");
 		fixThaumcraftCandleColorArrayOutOfBounds = config.getBoolean("fixThaumcraftCandleColorArrayOutOfBounds", categoryBugfixes, true, "Makes Thaumcraft candles not cause an array out of bounds exception if rendered with metadata greater than 15.");
 		fixWitcheryGarlicGarlandBlockBounds = config.getBoolean("fixWitcheryGarlicGarlandBlockBounds", categoryBugfixes, true, "Makes Witchery Garlic Garlands use correct block bounds on every rotation.");
@@ -278,6 +281,7 @@ public static void loadModdedMixinConfig(File configFile) {
 		reuseAetherIIRenderPlayer = config.getBoolean("reuseAetherIIRenderPlayer", categoryPerformance, true, "Makes Aether II reuse the same player renderer object across frames.");
 
 		//Tweaks
+		disableCrayfishFurnitureAchievements= config.getBoolean("disableCrayfishFurnitureAchievements", categoryTweaks, false, "Disables MrCrayfish's Furniture Mod achievements.");
 		proxyLLibraryPastebin = config.getBoolean("proxyLLibraryPastebin", categoryTweaks, false, "Use a pastebin proxy to keep LLibrary from crashing with some regional blocks.");
 
 		//Update old config options

src/main/java/jss/bugtorch/mixinplugin/BugTorchLateMixins.java

@@ -21,24 +21,28 @@ public String getMixinConfig() {
     @Override
     public List<String> getMixins(Set<String> loadedMods) {
 
-        if(!loadedMods.contains("ganyssurface")) {
+        if (!loadedMods.contains("cfm")) {
+            BugTorchConfig.fixCrayfishFurnitureNullPointerException = false;
+            BugTorchConfig.disableCrayfishFurnitureAchievements = false;
+        }
+        if (!loadedMods.contains("ganyssurface")) {
             BugTorchConfig.fixGanysSurfaceOpenTrapdoorBackTexture = false;
         }
-        if(!loadedMods.contains("llibrary")) {
+        if (!loadedMods.contains("llibrary")) {
             BugTorchConfig.proxyLLibraryPastebin = false;
         }
-        if(!loadedMods.contains("Thaumcraft")) {
+        if (!loadedMods.contains("Thaumcraft")) {
             BugTorchConfig.fixThaumcraftCandleColorArrayOutOfBounds = false;
         }
-        if(!loadedMods.contains("witchery")) {
+        if (!loadedMods.contains("witchery")) {
             BugTorchConfig.fixWitcheryGarlicGarlandBlockBounds = false;
             BugTorchConfig.fixWitcheryLeavesOptifineRendering = false;
             BugTorchConfig.fixWitcheryLeavesShearDupe = false;
         }
-        if(!loadedMods.contains("aether")) {
+        if (!loadedMods.contains("aether")) {
             BugTorchConfig.reuseAetherIIRenderPlayer = false;
         }
-        if(loadedMods.contains("notfine")) {
+        if (loadedMods.contains("notfine")) {
             BugTorchConfig.fixWitcheryLeavesOptifineRendering = false;
         }
 
@@ -47,29 +51,37 @@ public List<String> getMixins(Set<String> loadedMods) {
         List<String> mixins = new ArrayList<>();
 
         //Mod bugfixes
-        if(client && BugTorchConfig.fixGanysSurfaceOpenTrapdoorBackTexture) {
+        if (BugTorchConfig.fixCrayfishFurnitureNullPointerException) {
+            mixins.add("crayfishfurniture.fix.MixinTileEntityDishwasher");
+            mixins.add("crayfishfurniture.fix.MixinTileEntityMicrowave");
+            mixins.add("crayfishfurniture.fix.MixinTileEntityWashingMachine");
+        }
+        if (client && BugTorchConfig.fixGanysSurfaceOpenTrapdoorBackTexture) {
             mixins.add("ganyssurface.rendering.MixinBlockWoodTrapdoor");
         }
-        if(BugTorchConfig.fixThaumcraftCandleColorArrayOutOfBounds) {
-            if(client) {
+        if (BugTorchConfig.fixThaumcraftCandleColorArrayOutOfBounds) {
+            if (client) {
                 mixins.add("thaumcraft.sanitizearrayaccess.MixinBlockCandleRenderer");
             }
             mixins.add("thaumcraft.sanitizearrayaccess.MixinBlockCandle");
         }
-        if(BugTorchConfig.fixWitcheryGarlicGarlandBlockBounds) {
+        if (BugTorchConfig.fixWitcheryGarlicGarlandBlockBounds) {
             mixins.add("witchery.fix.MixinBlockGarlicGarland");
         }
-        if(client && BugTorchConfig.fixWitcheryLeavesOptifineRendering) {
+        if (client && BugTorchConfig.fixWitcheryLeavesOptifineRendering) {
             mixins.add("witchery.rendering.MixinBlockWitchLeaves");
         }
-        if(BugTorchConfig.fixWitcheryLeavesShearDupe) {
+        if (BugTorchConfig.fixWitcheryLeavesShearDupe) {
             mixins.add("witchery.shearing.MixinBlockWitchLeaves");
         }
-        if(client && BugTorchConfig.reuseAetherIIRenderPlayer) {
+        if (client && BugTorchConfig.reuseAetherIIRenderPlayer) {
             mixins.add("aetherii.optimization.MixinClientEventHandler");
         }
 
         //Mod tweaks
+        if(BugTorchConfig.disableCrayfishFurnitureAchievements) {
+            mixins.add("crayfishfurniture.tweak.MixinFurnitureAchievements");
+        }
         if(BugTorchConfig.proxyLLibraryPastebin) {
             mixins.add("llibrary.fix.MixinWebUtils");
         }

src/main/java/jss/bugtorch/mixins/late/crayfishfurniture/fix/MixinTileEntityDishwasher.java

@@ -0,0 +1,19 @@
+package jss.bugtorch.mixins.late.crayfishfurniture.fix;
+
+import com.mrcrayfish.furniture.tileentity.TileEntityDishwasher;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+@Mixin(value = TileEntityDishwasher.class)
+public abstract class MixinTileEntityDishwasher {
+
+    /**
+     * @author jss2a98aj
+     * @reason Stop crashing vanilla and modded content that looks for ISidedInventory.
+     */
+    @Overwrite
+    public int[] getAccessibleSlotsFromSide(int side) {
+        return new int[]{};
+    }
+
+}

src/main/java/jss/bugtorch/mixins/late/crayfishfurniture/fix/MixinTileEntityMicrowave.java

@@ -0,0 +1,19 @@
+package jss.bugtorch.mixins.late.crayfishfurniture.fix;
+
+import com.mrcrayfish.furniture.tileentity.TileEntityMicrowave;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+@Mixin(value = TileEntityMicrowave.class)
+public abstract class MixinTileEntityMicrowave {
+
+    /**
+     * @author jss2a98aj
+     * @reason Stop crashing vanilla and modded content that looks for ISidedInventory.
+     */
+    @Overwrite
+    public int[] getAccessibleSlotsFromSide(int side) {
+        return new int[]{};
+    }
+
+}

src/main/java/jss/bugtorch/mixins/late/crayfishfurniture/fix/MixinTileEntityWashingMachine.java

@@ -0,0 +1,19 @@
+package jss.bugtorch.mixins.late.crayfishfurniture.fix;
+
+import com.mrcrayfish.furniture.tileentity.TileEntityWashingMachine;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+@Mixin(value = TileEntityWashingMachine.class)
+public abstract class MixinTileEntityWashingMachine {
+
+    /**
+     * @author jss2a98aj
+     * @reason Stop crashing vanilla and modded content that looks for ISidedInventory.
+     */
+    @Overwrite
+    public int[] getAccessibleSlotsFromSide(int side) {
+        return new int[]{};
+    }
+
+}

src/main/java/jss/bugtorch/mixins/late/crayfishfurniture/tweak/MixinFurnitureAchievements.java

@@ -0,0 +1,32 @@
+package jss.bugtorch.mixins.late.crayfishfurniture.tweak;
+
+import com.mrcrayfish.furniture.FurnitureAchievements;
+import net.minecraft.entity.player.EntityPlayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+@Mixin(value = FurnitureAchievements.class)
+public abstract class MixinFurnitureAchievements {
+
+    /**
+     * @author jss2a98aj
+     * @reason Disables achievements.
+     */
+    @Overwrite(remap = false)
+    public static void loadAchievements() {}
+
+    /**
+     * @author jss2a98aj
+     * @reason Disables achievements.
+     */
+    @Overwrite(remap = false)
+    public static void registerPage() {}
+
+    /**
+     * @author jss2a98aj
+     * @reason Disables achievements.
+     */
+    @Overwrite(remap = false)
+    public static void triggerAchievement(EntityPlayer player, String name) {}
+
+}