diff --git a/gradle.properties b/gradle.properties index 97ea43f..2507a2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.3 # Mod Properties - mod_version = 0.0.1 + mod_version = 1.0.0 maven_group = me.parsell archives_base_name = glowstonewire diff --git a/src/main/java/me/parsell/glowstonewire/GlowstoneWireConfig.java b/src/main/java/me/parsell/glowstonewire/GlowstoneWireConfig.java index 1233c72..d0e4c17 100644 --- a/src/main/java/me/parsell/glowstonewire/GlowstoneWireConfig.java +++ b/src/main/java/me/parsell/glowstonewire/GlowstoneWireConfig.java @@ -5,6 +5,7 @@ import me.shedaniel.autoconfig.annotation.Config; @Config(name = "GlowstoneWire") public class GlowstoneWireConfig implements ConfigData{ + public String Description = "Changing this does nothing. Replacing glowstone drops is dirty, and will overwrite ALL loot tables that attempt to change minecraft's glowstone loot table. Disable this, and cocnsider using a datapack to achieve what you want."; public boolean addConversionRecipes = true; public boolean replaceGlowstoneDrop = true; } diff --git a/src/main/java/me/parsell/glowstonewire/core/glowLootTables.java b/src/main/java/me/parsell/glowstonewire/core/glowLootTables.java index 0a4a0c3..4b3eef8 100644 --- a/src/main/java/me/parsell/glowstonewire/core/glowLootTables.java +++ b/src/main/java/me/parsell/glowstonewire/core/glowLootTables.java @@ -120,8 +120,6 @@ public class glowLootTables { glowstonelootTable = new JsonObject(); glowstonelootTable.addProperty("type", "minecraft:block"); glowstonelootTable.add("pools", lootPoolsArray); - - System.out.println(glowstonelootTable.toString()); } } } diff --git a/src/main/java/me/parsell/glowstonewire/core/glowRecipes.java b/src/main/java/me/parsell/glowstonewire/core/glowRecipes.java index ca10ab3..6e2bebc 100644 --- a/src/main/java/me/parsell/glowstonewire/core/glowRecipes.java +++ b/src/main/java/me/parsell/glowstonewire/core/glowRecipes.java @@ -27,6 +27,7 @@ public class glowRecipes { BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.STRENGTH, glowItems.GLOWSTONE_DUST, Potions.STRONG_STRENGTH); // Manually reset the glowstone compability, since i cant find a way to read and reset. + Ingredient defaultFSFlickerModifier = FireworkStarRecipeAccessor.getFlickerModifier(); FireworkStarRecipeAccessor.setFlickerModifier(Ingredient.ofItems(Items.GLOWSTONE_DUST, glowItems.GLOWSTONE_DUST)); if(GlowstoneWire.CONFIG.addConversionRecipes) { diff --git a/src/main/java/me/parsell/glowstonewire/mixin/LootManagerInjector.java b/src/main/java/me/parsell/glowstonewire/mixin/LootManagerInjector.java index b65ace6..621ba3a 100644 --- a/src/main/java/me/parsell/glowstonewire/mixin/LootManagerInjector.java +++ b/src/main/java/me/parsell/glowstonewire/mixin/LootManagerInjector.java @@ -21,7 +21,7 @@ public class LootManagerInjector { @Inject(method = "apply", at = @At("HEAD")) public void interceptApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo info) { if (GlowstoneWire.CONFIG.replaceGlowstoneDrop) { - map.put(new Identifier("minecraft", "glowstone"), glowLootTables.glowstonelootTable); + map.put(new Identifier("minecraft", "blocks/glowstone"), glowLootTables.glowstonelootTable); } } } diff --git a/src/main/resources/data/glowstonewire/loot_tables/block/glowstone_wire.json b/src/main/resources/data/glowstonewire/loot_tables/blocks/glowstone_wire.json similarity index 100% rename from src/main/resources/data/glowstonewire/loot_tables/block/glowstone_wire.json rename to src/main/resources/data/glowstonewire/loot_tables/blocks/glowstone_wire.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fcdc2c4..e153689 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "glowstonewire", - "version": "${version}", + "version": "1.0.0", "name": "Glowstone Wire", "description": "Adds redstone like dust in the form of glowstone, used to emit a lower light level in a small form factor", @@ -9,8 +9,8 @@ "Ganku (Badjman)" ], "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" + "homepage": "", + "sources": "https://git.parsell.me/Justi/GlowstoneWire/" }, "license": "MIT", @@ -32,9 +32,9 @@ "depends": { "fabricloader": ">=0.7.4", "fabric": "*", - "minecraft": "1.16.x" + "minecraft": "1.16.x", + "cloth-config2": ">=4.11.26" }, "suggests": { - "another-mod": "*" } }