Fix textures when inspirations

isn't installed.
Mrbysco · Sep 14, 2019 · 2805ec7 · 2805ec7
1 parent 70de384
commit 2805ec7
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 54 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.4.5"
+version = "1.4.6"
 group = "com.mrbysco.morecauldrons" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "More-Cauldrons"
 

diff --git a/src/main/java/com/Mrbysco/MoreCauldrons/ModReference.java b/src/main/java/com/Mrbysco/MoreCauldrons/ModReference.java
@@ -4,7 +4,7 @@ public class ModReference {
 	public static final String MOD_ID = "morecauldrons";
 	public static final String MOD_NAME = "More Cauldrons";
 	public static final String MOD_PREFIX = "morecauldrons:";
-	public static final String VERSION = "1.4.5";
+	public static final String VERSION = "1.4.6";
 	public static final String ACCEPTED_VERSIONS = "[1.12]";
 	public static final String DEPENDENCIES = "after:inspirations;";
 

diff --git a/src/main/java/com/Mrbysco/MoreCauldrons/blocks/inspirations/jei/JEIPlugin.java b/src/main/java/com/Mrbysco/MoreCauldrons/blocks/inspirations/jei/JEIPlugin.java
@@ -1,30 +1,31 @@
 package com.mrbysco.morecauldrons.blocks.inspirations.jei;
 
+import javax.annotation.Nonnull;
+
 import com.mrbysco.morecauldrons.blocks.inspirations.ICauldron;
 import com.mrbysco.morecauldrons.init.ModBlocks;
-import knightminer.inspirations.common.Config;
-import knightminer.inspirations.common.PulseBase;
-import knightminer.inspirations.plugins.jei.cauldron.CauldronRecipeCategory;
+
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.Loader;
-
-import javax.annotation.Nonnull;
+import net.minecraftforge.fml.common.Optional;
 
 @mezz.jei.api.JEIPlugin
 public class JEIPlugin implements IModPlugin {
 	@Override
 	public void register(@Nonnull IModRegistry registry) {
-		if(Loader.isModLoaded("inspirations"))
-		{
-			if(PulseBase.isRecipesLoaded()) {
-				if(Config.enableCauldronRecipes) {
-					for(Block block : ModBlocks.BLOCKS)
-						if(block instanceof ICauldron)
-							registry.addRecipeCatalyst(new ItemStack(block), CauldronRecipeCategory.CATEGORY);
-				}
+		registerInspirations(registry);
+	}
+
+
+	@Optional.Method(modid = "inspirations")
+	public void registerInspirations(@Nonnull IModRegistry registry) {
+		if(knightminer.inspirations.common.PulseBase.isRecipesLoaded()) {
+			if(knightminer.inspirations.common.Config.enableCauldronRecipes) {
+				for(Block block : ModBlocks.BLOCKS)
+					if(block instanceof ICauldron)
+						registry.addRecipeCatalyst(new ItemStack(block), knightminer.inspirations.plugins.jei.cauldron.CauldronRecipeCategory.CATEGORY);
 			}
 		}
 	}

diff --git a/src/main/resources/assets/morecauldrons/blockstates/acacia_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/acacia_cauldron.json
@@ -12,7 +12,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/andesite_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/andesite_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/big_oak_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/big_oak_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/birch_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/birch_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/brick_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/brick_cauldron.json
@@ -12,7 +12,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/cobble_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/cobble_cauldron.json
@@ -12,7 +12,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/diamond_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/diamond_cauldron.json
@@ -12,7 +12,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/diorite_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/diorite_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/glass_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/glass_cauldron.json
@@ -6,7 +6,6 @@
 		"1" : { "model": "morecauldrons:glass_cauldron_level1" },
 		"2" : { "model": "morecauldrons:glass_cauldron_level2" },
 		"3" : { "model": "morecauldrons:glass_cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/gold_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/gold_cauldron.json
@@ -12,7 +12,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/granite_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/granite_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/jungle_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/jungle_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/oak_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/oak_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/obsidian_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/obsidian_cauldron.json
@@ -12,7 +12,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/smooth_andesite_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/smooth_andesite_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/smooth_diorite_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/smooth_diorite_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/smooth_granite_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/smooth_granite_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/spruce_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/spruce_cauldron.json
@@ -13,7 +13,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }
diff --git a/src/main/resources/assets/morecauldrons/blockstates/stone_cauldron.json b/src/main/resources/assets/morecauldrons/blockstates/stone_cauldron.json
@@ -12,7 +12,6 @@
 		"1" : { "model": "morecauldrons:cauldron_level1" },
 		"2" : { "model": "morecauldrons:cauldron_level2" },
 		"3" : { "model": "morecauldrons:cauldron_level3" }
-    },
-    "inventory": [{}]
+    }
   }
 }