Update 'README.md'

notification that this mod will die

README.md

@@ -5,3 +5,8 @@ Adds redstone-like dust for glowstone.
 - Can be customized to look a little more stylized
 
 10/10, great mod.
+
+===================
+
+This mod will not see any further updates,
+And I urge you to look at Wired Dust by myself.

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
 

src/main/java/me/parsell/glowstonewire/GlowstoneWire.java

@@ -2,6 +2,7 @@ package me.parsell.glowstonewire;
 
 import me.parsell.glowstonewire.core.glowBlocks;
 import me.parsell.glowstonewire.core.glowItems;
+import me.parsell.glowstonewire.core.glowLootTables;
 import me.parsell.glowstonewire.core.glowRecipes;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
@@ -19,5 +20,6 @@ public class GlowstoneWire implements ModInitializer {
     	glowBlocks.init();
     	glowItems.init();
 		glowRecipes.init();
+		glowLootTables.init();
 	}
 }

src/main/java/me/parsell/glowstonewire/GlowstoneWireConfig.java

@@ -5,7 +5,7 @@ import me.shedaniel.autoconfig.annotation.Config;
 
 @Config(name = "GlowstoneWire")
 public class GlowstoneWireConfig implements ConfigData{
-    public boolean addPotionRecipes = true;
+    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;
-    public boolean addConversionRecipe = true;
 }

src/main/java/me/parsell/glowstonewire/core/glowItems.java

@@ -19,18 +19,5 @@ public class glowItems {
 
   public static void init(){
     Registry.register(Registry.ITEM, new Identifier(GlowstoneWire.MODID, "glowstone_dust"), GLOWSTONE_DUST);
-
-    if (GlowstoneWire.CONFIG.addPotionRecipes) {
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.WATER, GLOWSTONE_DUST, Potions.THICK);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.LEAPING, GLOWSTONE_DUST, Potions.STRONG_LEAPING);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.SLOWNESS, GLOWSTONE_DUST, Potions.STRONG_SLOWNESS);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.TURTLE_MASTER, GLOWSTONE_DUST, Potions.STRONG_TURTLE_MASTER);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.SWIFTNESS, GLOWSTONE_DUST, Potions.STRONG_SWIFTNESS);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.HEALING, GLOWSTONE_DUST, Potions.STRONG_HEALING);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.HARMING, GLOWSTONE_DUST, Potions.STRONG_HARMING);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.POISON, GLOWSTONE_DUST, Potions.STRONG_POISON);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.REGENERATION, GLOWSTONE_DUST, Potions.STRONG_REGENERATION);
-      BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.STRENGTH, GLOWSTONE_DUST, Potions.STRONG_STRENGTH);
-    }
   }
 }

src/main/java/me/parsell/glowstonewire/core/glowLootTables.java

@@ -0,0 +1,125 @@
+package me.parsell.glowstonewire.core;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
+import me.parsell.glowstonewire.GlowstoneWire;
+
+public class glowLootTables {
+    public static JsonObject glowstonelootTable;
+
+    public static void init(){
+      if(GlowstoneWire.CONFIG.replaceGlowstoneDrop) {
+        JsonObject explosion;
+        JsonObject limitValues, limit;
+        JsonObject bonus, parametersValues;
+        JsonObject count, countValues;
+        JsonArray secondItemArray;
+        JsonObject secondItem;
+    
+        JsonObject levelsValues, silktouch;
+        JsonArray enchantmentsArray;
+        JsonObject enchantments, match;
+        JsonArray firstItemArray;
+        JsonObject firstItem;
+    
+        JsonArray alternativesArray;
+        JsonObject alternatives;
+    
+        JsonArray rollsArray;
+        JsonObject rolls;
+    
+        JsonArray lootPoolsArray;
+
+        explosion = new JsonObject();
+        explosion.addProperty("function", "minecraft:explosion_decay");
+
+        limit = new JsonObject();
+        limit.addProperty("function", "minecraft:limit_count");
+        limitValues = new JsonObject();
+        limitValues.addProperty("max", 4);
+        limitValues.addProperty("min", 1);
+        limit.add("limit", limitValues);
+
+        bonus = new JsonObject();
+        bonus.addProperty("function", "minecraft:apply_bonus");
+        bonus.addProperty("enchantment", "minecraft:fortune");
+        bonus.addProperty("formula", "minecraft:uniform_bonus_count");
+        parametersValues = new JsonObject();
+        parametersValues.addProperty("bonusMultiplier", 1);
+        bonus.add("parameters", parametersValues);
+
+        count = new JsonObject();
+        count.addProperty("function", "minecraft:set_count");
+        countValues = new JsonObject();
+        countValues.addProperty("min", 2.0);
+        countValues.addProperty("max", 4.0);
+        countValues.addProperty("type", "minecraft:uniform");
+        count.add("count", countValues);
+
+        secondItemArray = new JsonArray();
+        secondItemArray.add(count);
+        secondItemArray.add(bonus);
+        secondItemArray.add(limit);
+        secondItemArray.add(explosion);
+
+        secondItem = new JsonObject();
+        secondItem.addProperty("type", "minecraft:item");
+        secondItem.add("functions", secondItemArray);
+        secondItem.addProperty("name", "glowstonewire:glowstone_dust");
+
+        //
+
+        levelsValues = new JsonObject();
+        levelsValues.addProperty("min", 1);
+        silktouch = new JsonObject();
+        silktouch.addProperty("enchantment", "minecraft:silk_touch");
+        silktouch.add("levels", levelsValues);
+
+        enchantmentsArray = new JsonArray();
+        enchantmentsArray.add(silktouch);
+        enchantments = new JsonObject();
+        enchantments.add("enchantments", enchantmentsArray);
+
+        match = new JsonObject();
+        match.addProperty("condition", "minecraft:match_tool");
+        match.add("predicate", enchantments);
+
+        firstItemArray = new JsonArray();
+        firstItemArray.add(match);
+        
+        firstItem = new JsonObject();
+        firstItem.addProperty("type", "minecraft:item");
+        firstItem.add("conditions", firstItemArray);
+        firstItem.addProperty("name", "minecraft:glowstone");
+
+        //
+
+        alternativesArray = new JsonArray();
+        alternativesArray.add(firstItem);
+        alternativesArray.add(secondItem);
+
+        alternatives = new JsonObject();
+        alternatives.addProperty("type", "minecraft:alternatives");
+        alternatives.add("children", alternativesArray);
+
+        //
+
+        rollsArray = new JsonArray();
+        rollsArray.add(alternatives);
+
+        rolls = new JsonObject();
+        rolls.addProperty("rolls", 1);
+        rolls.add("entries", rollsArray);
+
+        //
+
+        lootPoolsArray = new JsonArray();
+        lootPoolsArray.add(rolls);
+
+        glowstonelootTable = new JsonObject();
+        glowstonelootTable.addProperty("type", "minecraft:block");
+        glowstonelootTable.add("pools", lootPoolsArray);
+      }
+    }
+}

src/main/java/me/parsell/glowstonewire/core/glowRecipes.java

@@ -4,15 +4,34 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 
 import me.parsell.glowstonewire.GlowstoneWire;
+import me.parsell.glowstonewire.mixin.BrewingRecipeRegistryInvoker;
+import me.parsell.glowstonewire.mixin.FireworkStarRecipeAccessor;
+import net.minecraft.item.Items;
+import net.minecraft.potion.Potions;
+import net.minecraft.recipe.Ingredient;
 
 public class glowRecipes {
     public static JsonObject MODDED_TO_VANILLA;
     public static JsonObject VANILLA_TO_MODDED;
 
     public static void init(){
-        // Vanilla Glowstone -> Modded Glowstone
-        if(GlowstoneWire.CONFIG.addConversionRecipe || true) {
-            // This is the json objects
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.WATER, glowItems.GLOWSTONE_DUST, Potions.THICK);
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.LEAPING, glowItems.GLOWSTONE_DUST, Potions.STRONG_LEAPING);
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.SLOWNESS, glowItems.GLOWSTONE_DUST, Potions.STRONG_SLOWNESS);
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.TURTLE_MASTER, glowItems.GLOWSTONE_DUST, Potions.STRONG_TURTLE_MASTER);
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.SWIFTNESS, glowItems.GLOWSTONE_DUST, Potions.STRONG_SWIFTNESS);
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.HEALING, glowItems.GLOWSTONE_DUST, Potions.STRONG_HEALING);
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.HARMING, glowItems.GLOWSTONE_DUST, Potions.STRONG_HARMING);
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.POISON, glowItems.GLOWSTONE_DUST, Potions.STRONG_POISON);
+        BrewingRecipeRegistryInvoker.registerPotionRecipe(Potions.REGENERATION, glowItems.GLOWSTONE_DUST, Potions.STRONG_REGENERATION);
+        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) {
+            // Base JsonObjects
             JsonObject cIngredientVanilla = new JsonObject();
             JsonObject CIngredientModded = new JsonObject();
             JsonArray cIngredientsList = new JsonArray();
@@ -22,14 +41,11 @@ public class glowRecipes {
 
             // FOR VANILLA TO MODDED
             VANILLA_TO_MODDED = new JsonObject();
-            
             // Header, defining what type of crafting recipe it is
             VANILLA_TO_MODDED.addProperty("type", "minecraft:crafting_shapeless");
-    
             // Adding the ingredients
             cIngredientsList.add(cIngredientVanilla);
             VANILLA_TO_MODDED.add("ingredients", cIngredientsList);
-    
             // Adding the result
             VANILLA_TO_MODDED.add("result", CIngredientModded);
 
@@ -38,19 +54,13 @@ public class glowRecipes {
     
             // FOR MODDED TO VANILLA
             MODDED_TO_VANILLA = new JsonObject();
-    
             // Define recipe type
             MODDED_TO_VANILLA.addProperty("type", "minecraft:crafting_shapeless");
-    
             // Add ingredients
             cIngredientsList.add(CIngredientModded);
             MODDED_TO_VANILLA.add("ingredients", cIngredientsList);
-    
             // Add result
             MODDED_TO_VANILLA.add("result", cIngredientVanilla);
-
-            System.out.println(MODDED_TO_VANILLA.toString());
-            System.out.println(VANILLA_TO_MODDED.toString());
         }
     }
 }

src/main/java/me/parsell/glowstonewire/mixin/FireworkStarRecipeAccessor.java

@@ -0,0 +1,20 @@
+package me.parsell.glowstonewire.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.recipe.FireworkStarRecipe;
+import net.minecraft.recipe.Ingredient;
+
+@Mixin(FireworkStarRecipe.class)
+public interface FireworkStarRecipeAccessor {
+    @Accessor("FLICKER_MODIFIER")
+    public static Ingredient getFlickerModifier(){
+        throw new AssertionError();
+    }
+
+    @Accessor("FLICKER_MODIFIER")
+    public static void setFlickerModifier(Ingredient FLICKER_MODIFIER){
+        throw new AssertionError();
+    }
+}

src/main/java/me/parsell/glowstonewire/mixin/LootManagerInjector.java

@@ -0,0 +1,27 @@
+package me.parsell.glowstonewire.mixin;
+
+import java.util.Map;
+
+import com.google.gson.JsonElement;
+
+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.CallbackInfo;
+
+import me.parsell.glowstonewire.GlowstoneWire;
+import me.parsell.glowstonewire.core.glowLootTables;
+import net.minecraft.loot.LootManager;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.profiler.Profiler;
+
+@Mixin(LootManager.class)
+public class LootManagerInjector {
+    @Inject(method = "apply", at = @At("HEAD"))
+    public void interceptApply(Map<Identifier, JsonElement> map, ResourceManager resourceManager, Profiler profiler, CallbackInfo info) {
+        if (GlowstoneWire.CONFIG.replaceGlowstoneDrop) {
+            map.put(new Identifier("minecraft", "blocks/glowstone"), glowLootTables.glowstonelootTable);
+        }
+    }
+}

src/main/java/me/parsell/glowstonewire/mixin/RecipeManagerInjector.java

@@ -20,7 +20,7 @@ import net.minecraft.util.profiler.Profiler;
 public class RecipeManagerInjector {
     @Inject(method = "apply", at = @At("HEAD"))
     public void interceptApply(Map<Identifier, JsonElement> map, ResourceManager resourceManager, Profiler profiler, CallbackInfo info) {
-        if (GlowstoneWire.CONFIG.addConversionRecipe) {
+        if (GlowstoneWire.CONFIG.addConversionRecipes) {
             map.put(new Identifier(GlowstoneWire.MODID, "glowstone_vanilla_modded"), glowRecipes.VANILLA_TO_MODDED);
             map.put(new Identifier(GlowstoneWire.MODID, "glowstone_modded_vanilla"), glowRecipes.MODDED_TO_VANILLA);
         }

src/main/resources/data/glowstonewire/loot_tables/blocks/glowstone_wire.json

@@ -0,0 +1,19 @@
+{
+    "type": "minecraft:block",
+    "pools": [
+      {
+        "rolls": 1,
+        "entries": [
+          {
+            "type": "minecraft:item",
+            "name": "glowstonewire:glowstone_dust"
+          }
+        ],
+        "conditions": [
+          {
+            "condition": "minecraft:survives_explosion"
+          }
+        ]
+      }
+    ]
+  }

src/main/resources/data/glowstonewire/recipes/gw_glowstone.json

@@ -0,0 +1,15 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+      "##",
+      "##"
+    ],
+    "key": {
+      "#": {
+        "item": "glowstonewire:glowstone_dust"
+      }
+    },
+    "result": {
+      "item": "minecraft:glowstone"
+    }
+  }

src/main/resources/data/glowstonewire/recipes/gw_spectral_arrow.json

@@ -0,0 +1,20 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+      " # ",
+      "#X#",
+      " # "
+    ],
+    "key": {
+      "#": {
+        "item": "glowstonewire:glowstone_dust"
+      },
+      "X": {
+        "item": "minecraft:arrow"
+      }
+    },
+    "result": {
+      "item": "minecraft:spectral_arrow",
+      "count": 2
+    }
+  }

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": "*"
   }
 }

src/main/resources/glowstonewire.mixins.json

@@ -7,7 +7,9 @@
   ],
   "client": [
     "BrewingRecipeRegistryInvoker",
-    "RecipeManagerInjector"
+    "RecipeManagerInjector",
+    "LootManagerInjector",
+    "FireworkStarRecipeAccessor"
   ],
   "injectors": {
     "defaultRequire": 1