.gitattributes

@@ -3,7 +3,3 @@
 # are changed when only line endings change.
 src/generated/**/.cache/cache text eol=lf
 src/generated/**/*.json text eol=lf
-
-# Detect json files
-*.json linguist-detectable
-*.mcmeta linguist-detectable

README.md

@@ -1,18 +1,18 @@
 # Minecraft Rebalance
 
-Major and minor tweaks to Minecraft's recipes, loot tables and item data with progression as a high priority. This low-code Forge 1.20.1 mod is designed for its [parent modpack](https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering). It does not run outside its pack due to certain dependencies in the pack. 
+Major and minor tweaks to Minecraft's recipes, loot tables and item data with progression as a high priority. This low-code Forge 1.20.1 mod is designed for a TBA modpack, but should function adequately in an otherwise vanilla server.
+
+This mod does *not* change the difficulty of the game. 
 
 To compile, use: <pre>./gradlew build</pre>
 
 Remember to change the JDK version to a compatible version, ie.: <pre>-Dorg.gradle.java.home=/usr/lib/jvm/java-21-openjdk</pre>
 
-The below changes represent what is in the modpack itself.
-
 ## Vanilla changes
 
 - Removes wooden tools, there is now only a wooden paxel
 - Replaces stone tools with copper
-- Significantly buffs gold to between iron and diamond, buffs diamond and netherite to suit
+- Significantly buffs gold to between iron and diamond, buffs diamond and netheriute to suit
 - Removes diamond from the overworld and adds magma cream to diamond equipment recipes
 - Pushes redstone to massive veins at the very bottom of the world (so we could increase gold/iron/lapis rates)
 - Replaces diamonds in jukeboxes and enchanting tables with amethyst
@@ -22,27 +22,25 @@ The below changes represent what is in the modpack itself.
 - Changes every single lootpool to stop players skipping tiers so easily and reward them more for progression
 - Adds a 4:1 conversion between hide and leather and makes leather armour craftable from hide
 - Obsidian no longer takes until the end of time to mine
-- Enchanting reworked (see [Enchancement](https://modrinth.com/mod/enchancement))
-- Added a modular tool system to replace wooden paxels (see TC/Tetras changes below)
-- Tweaked worldgen for all three dimensions
-- (In progress) Edited villager trades to be focused on improving equipment found elsewhere
-- (In progress) Edited food to encourage dedicated sources of meat instead of just taking sheep/cows forever
 
-## Tinker's Construct and Tetra
+## Tinker's Construct
 
-- Disables all TC tools and related molds (except battlesigns because funny) 
+- Disables all tools and related molds (except battlesigns because funny) 
 - Disables all slimelands (makes skyslime craftable from slime and a diamond)
 - Disables cinderslime (we couldn't find a good place for it in the new progression)
 - Adds every remaining Tinker's Construct material to Tetra
-- Changes blackstone to cobalt in the Tetra hammer line
 
 ## To-Do
 
+- Nerf Protection considerably (not its variants)
+- Nerf Sharpness (not its variants)
 - Remove the experience cost of enchanting with a table (not anvil)
+- Increase overworld ore rates to fill in diamond/redstone gaps
 - Start ancient debris generating in the End
 - Add a new music disc, sure, why not
-- Replace the obsidian hammer with something (we have not decided what)
+- Add two developer items
+- Tweak the hammers in Tetra to reflect progression
+- Replace the blackstone hammer with cobalt and the obsidian hammer with something (we have not decided what)
+- Make minecarts fast
 - New texture for the enchanting table
-- Delete slimewood and nahuatl
-- Make TC smelteries an opt-in config due to vanilla requirements
-- Make crops grow ~50% faster
+- I forgot slimewood and nahuatl lol

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
 }
 
-version = '1.20.1-0.0.1'
+version = '1.20.1/0.0.1'
 group = 'xyz.nearmisses.patience'
 
 base {

src/main/java/com/nearmisses/mc_rebalance/AltArmourTier.java

@@ -1,73 +0,0 @@
-package xyz.nearmisses.patience.mc_rebalance;
-
-import xyz.nearmisses.patience.mc_rebalance.MC_Rebalance;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.item.ArmorItem;
-import net.minecraft.world.item.ArmorMaterial;
-import net.minecraft.world.item.crafting.Ingredient;
-
-import java.util.function.Supplier;
-
-public class AltArmourTier implements ArmorMaterial {
-	private final int[] durabilityForType;
-	private final int[] defenseForType;
-	private final int enchantability;
-	private final SoundEvent equipSound;
-	private final Supplier<Ingredient> repairMaterial;
-	private final String name;
-	private final float toughness;
-	private final float knockbackResistance;
-	private final String namespace;
-
-	public AltArmourTier(int[] durabilityForType, int[] defenseForType, int enchantability, SoundEvent equipSound, Supplier<Ingredient> repairMaterial, String name, float toughness, float knockbackResistance, String namespace) {
-		this.durabilityForType = durabilityForType;
-		this.defenseForType = defenseForType;
-		this.enchantability = enchantability;
-		this.equipSound = equipSound;
-		this.repairMaterial = repairMaterial;
-		this.name = name;
-		this.toughness = toughness;
-		this.knockbackResistance = knockbackResistance;
-		this.namespace = namespace;
-	}
-
-	@Override
-	public int getDurabilityForType(ArmorItem.Type type) {
-		return this.durabilityForType[type.ordinal()];
-	}
-
-	@Override
-	public int getDefenseForType(ArmorItem.Type type) {
-		return this.defenseForType[type.ordinal()];
-	}
-
-	@Override
-	public int getEnchantmentValue() {
-		return this.enchantability;
-	}
-
-	@Override
-	public SoundEvent getEquipSound() {
-		return this.equipSound;
-	}
-
-	@Override
-	public Ingredient getRepairIngredient() {
-		return this.repairMaterial.get();
-	}
-
-	@Override
-	public String getName() {
-		return this.namespace + ":" + this.name;
-	}
-
-	@Override
-	public float getToughness() {
-		return this.toughness;
-	}
-
-	@Override
-	public float getKnockbackResistance() {
-		return this.knockbackResistance;
-	}
-}

src/main/java/com/nearmisses/mc_rebalance/AltArmourTiers.java

@@ -1,29 +0,0 @@
-package xyz.nearmisses.patience.mc_rebalance;
-
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraftforge.common.ForgeTier;
-import net.minecraft.world.item.ArmorMaterial;
-import net.minecraft.world.item.ArmorItem;
-import net.minecraft.core.Holder;
-
-import net.minecraft.world.item.Items;
-import net.minecraft.tags.*;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvents;
-
-import xyz.nearmisses.patience.mc_rebalance.MC_Rebalance;
-import xyz.nearmisses.patience.mc_rebalance.AltArmourTier;
-
-public class AltArmourTiers {
-	public static final AltArmourTier Gold = new AltArmourTier(
-		new int[]{264,410,360,340}, // Armour durabilities
-		new int[]{3,8,6,3}, // Armour defence
-		22, // Enchantability
-		SoundEvents.ARMOR_EQUIP_GOLD, // Equip sound
-		() -> Ingredient.of(Items.GOLD_INGOT), // Repair material
-		"gold", // Name
-		0.0f, // Toughness
-		0.0f, // Knockback resistance
-		"minecraft" // Namespace
-	);
-}

src/main/java/com/nearmisses/mc_rebalance/AltTiers.java

@@ -2,7 +2,6 @@ package xyz.nearmisses.patience.mc_rebalance;
 
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraftforge.common.ForgeTier;
-import net.minecraftforge.common.TierSortingRegistry;
 
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
@@ -15,8 +14,8 @@ public class AltTiers {
 
 	// public static final TagKey<Block> GoldenTool = BlockTags.create(new ResourceLocation(MC_Rebalance.MODID, "needs_golden_tool"));
 	public static final TagKey<Block> needsGold = BlockTags.create(ResourceLocation.fromNamespaceAndPath(MC_Rebalance.MODID, "needs_golden_tool"));
-	public static final TagKey<Block> needsDiamond = BlockTags.create(ResourceLocation.fromNamespaceAndPath("minecraft", "needs_diamond_tool"));
-	public static final TagKey<Block> needsDendrite= BlockTags.create(ResourceLocation.fromNamespaceAndPath("forge", "needs_netherite_tool"));
+	public static final TagKey<Block> needsDiamond = BlockTags.create(ResourceLocation.fromNamespaceAndPath(MC_Rebalance.MODID, "needs_diamond_tool"));
+	public static final TagKey<Block> needsDendrite= BlockTags.create(ResourceLocation.fromNamespaceAndPath(MC_Rebalance.MODID, "needs_dendrite_tool"));
 
     public static final ForgeTier Gold = new ForgeTier(
             3, // Mining tier
@@ -30,6 +29,4 @@ public class AltTiers {
 
 	public static final ForgeTier Diamond = new ForgeTier(4, 1560, 8f, 4, 10, needsDiamond, () -> Ingredient.of(Items.DIAMOND));
 	public static final ForgeTier Dendrite= new ForgeTier(5, 2031,10f, 6, 15, needsDendrite,() -> Ingredient.of(Items.NETHERITE_INGOT));
-
-	// TierSortingRegistry.RegisterTier(Gold,ResourceLocation.fromNamespaceAndPath(MC_Rebalance.MODID, "needs_golden_tool"), )
 }

src/main/java/com/nearmisses/mc_rebalance/Config.java

@@ -18,47 +18,47 @@ import java.util.stream.Collectors;
 @Mod.EventBusSubscriber(modid = MC_Rebalance.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class Config
 {
-	private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+    private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
 
-	/*private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER
-			.comment("Whether to log the dirt block on common setup")
-			.define("logDirtBlock", true);
+    private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER
+            .comment("Whether to log the dirt block on common setup")
+            .define("logDirtBlock", true);
 
-	private static final ForgeConfigSpec.IntValue MAGIC_NUMBER = BUILDER
-			.comment("A magic number")
-			.defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE);
+    private static final ForgeConfigSpec.IntValue MAGIC_NUMBER = BUILDER
+            .comment("A magic number")
+            .defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE);
 
-	public static final ForgeConfigSpec.ConfigValue<String> MAGIC_NUMBER_INTRODUCTION = BUILDER
-			.comment("What you want the introduction message to be for the magic number")
-			.define("magicNumberIntroduction", "The magic number is... ");
+    public static final ForgeConfigSpec.ConfigValue<String> MAGIC_NUMBER_INTRODUCTION = BUILDER
+            .comment("What you want the introduction message to be for the magic number")
+            .define("magicNumberIntroduction", "The magic number is... ");
 
-	// a list of strings that are treated as resource locations for items
-	private static final ForgeConfigSpec.ConfigValue<List<? extends String>> ITEM_STRINGS = BUILDER
-			.comment("A list of items to log on common setup.")
-			.defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName);
-	*/
-	static final ForgeConfigSpec SPEC = BUILDER.build();
-	/*
-	public static boolean logDirtBlock;
-	public static int magicNumber;
-	public static String magicNumberIntroduction;
-	public static Set<Item> items;
+    // a list of strings that are treated as resource locations for items
+    private static final ForgeConfigSpec.ConfigValue<List<? extends String>> ITEM_STRINGS = BUILDER
+            .comment("A list of items to log on common setup.")
+            .defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName);
 
-	private static boolean validateItemName(final Object obj)
-	{
-		return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(ResourceLocation.withDefaultNamespace(itemName)\/*new ResourceLocation(itemName)*\/);
-	}
+    static final ForgeConfigSpec SPEC = BUILDER.build();
 
-	@SubscribeEvent
-	static void onLoad(final ModConfigEvent event)
-	{
-		logDirtBlock = LOG_DIRT_BLOCK.get();
-		magicNumber = MAGIC_NUMBER.get();
-		magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get();
+    public static boolean logDirtBlock;
+    public static int magicNumber;
+    public static String magicNumberIntroduction;
+    public static Set<Item> items;
 
-		// convert the list of strings into a set of items
-		items = ITEM_STRINGS.get().stream()
-				.map(itemName -> ForgeRegistries.ITEMS.getValue(ResourceLocation.withDefaultNamespace(itemName)))
-				.collect(Collectors.toSet());
-	}*/
+    private static boolean validateItemName(final Object obj)
+    {
+        return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName));
+    }
+
+    @SubscribeEvent
+    static void onLoad(final ModConfigEvent event)
+    {
+        logDirtBlock = LOG_DIRT_BLOCK.get();
+        magicNumber = MAGIC_NUMBER.get();
+        magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get();
+
+        // convert the list of strings into a set of items
+        items = ITEM_STRINGS.get().stream()
+                .map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName)))
+                .collect(Collectors.toSet());
+    }
 }

src/main/java/com/nearmisses/mc_rebalance/MC_Rebalance.java

@@ -5,11 +5,10 @@ import com.mojang.logging.LogUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.food.FoodProperties;
-// import net.minecraft.world.item.BlockItem;
-// import net.minecraft.world.item.CreativeModeTab;
-// import net.minecraft.world.item.CreativeModeTabs;
-// import net.minecraft.world.item.Item;
-// import net.minecraft.world.item.ArmorItem;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.CreativeModeTabs;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 // import net.minecraft.world.level.block.HorizontalDirectionalBlock;
 import net.minecraft.world.level.block.Blocks;
@@ -38,7 +37,6 @@ import net.minecraft.world.item.*;
 
 import xyz.nearmisses.patience.mc_rebalance.PlushBlock;
 import xyz.nearmisses.patience.mc_rebalance.AltTiers;
-import xyz.nearmisses.patience.mc_rebalance.AltArmourTiers;
 
 // import net.minecraft.world.item.*; // So I remember this exists
 
@@ -66,24 +64,19 @@ public class MC_Rebalance
 	public static final RegistryObject<Item> golden_sword = VANILLA_ITEMS.register("golden_sword",() -> new SwordItem(AltTiers.Gold, 3, -2.4f, new Item.Properties()));
 	public static final RegistryObject<Item> golden_axe = VANILLA_ITEMS.register("golden_axe",() -> new AxeItem(AltTiers.Gold, 6, -3.1f, new Item.Properties()) );
 	public static final RegistryObject<Item> golden_shovel = VANILLA_ITEMS.register("golden_shovel",() -> new ShovelItem(AltTiers.Gold, 1.5f, -3.0f, new Item.Properties()) );
-	public static final RegistryObject<Item> golden_hoe = VANILLA_ITEMS.register("golden_hoe",() -> new HoeItem(AltTiers.Gold, -1, -1.0f, new Item.Properties()) );
-
-	public static final RegistryObject<Item> golden_helmet = VANILLA_ITEMS.register("golden_helmet",() -> new ArmorItem(AltArmourTiers.Gold,ArmorItem.Type.HELMET,new Item.Properties()));
-	public static final RegistryObject<Item> golden_chestplate = VANILLA_ITEMS.register("golden_chestplate",() -> new ArmorItem(AltArmourTiers.Gold,ArmorItem.Type.CHESTPLATE,new Item.Properties()));
-	public static final RegistryObject<Item> golden_leggings = VANILLA_ITEMS.register("golden_leggings",() -> new ArmorItem(AltArmourTiers.Gold,ArmorItem.Type.LEGGINGS,new Item.Properties()));
-	public static final RegistryObject<Item> golden_boots = VANILLA_ITEMS.register("golden_boots",() -> new ArmorItem(AltArmourTiers.Gold,ArmorItem.Type.BOOTS,new Item.Properties()));
+	public static final RegistryObject<Item> golden_hoe = VANILLA_ITEMS.register("golden_hoe",() -> new PickaxeItem(AltTiers.Gold, -1, -1.0f, new Item.Properties()) );
 
 	public static final RegistryObject<Item> diamond_pick = VANILLA_ITEMS.register("diamond_pickaxe",() -> new PickaxeItem(AltTiers.Diamond, 1, -2.8f, new Item.Properties()) );
 	public static final RegistryObject<Item> diamond_sword = VANILLA_ITEMS.register("diamond_sword",() -> new SwordItem(AltTiers.Diamond, 3, -2.4f, new Item.Properties()));
 	public static final RegistryObject<Item> diamond_axe = VANILLA_ITEMS.register("diamond_axe",() -> new AxeItem(AltTiers.Diamond, 7, -3.0f, new Item.Properties()) );
 	public static final RegistryObject<Item> diamond_shovel = VANILLA_ITEMS.register("diamond_shovel",() -> new ShovelItem(AltTiers.Diamond, 1.5f, -3.0f, new Item.Properties()) );
-	public static final RegistryObject<Item> diamond_hoe = VANILLA_ITEMS.register("diamond_hoe",() -> new HoeItem(AltTiers.Diamond, -1, -1.0f, new Item.Properties()) );
+	public static final RegistryObject<Item> diamond_hoe = VANILLA_ITEMS.register("diamond_hoe",() -> new PickaxeItem(AltTiers.Diamond, -1, -1.0f, new Item.Properties()) );
 
 	public static final RegistryObject<Item> dendrite_pick = VANILLA_ITEMS.register("netherite_pickaxe",() -> new PickaxeItem(AltTiers.Dendrite, 1, -2.8f, new Item.Properties()) );
 	public static final RegistryObject<Item> dendrite_sword = VANILLA_ITEMS.register("netherite_sword",() -> new SwordItem(AltTiers.Dendrite, 3, -2.4f, new Item.Properties()));
 	public static final RegistryObject<Item> dendrite_axe = VANILLA_ITEMS.register("netherite_axe",() -> new AxeItem(AltTiers.Dendrite, 8, -3.0f, new Item.Properties()) );
 	public static final RegistryObject<Item> dendrite_shovel = VANILLA_ITEMS.register("netherite_shovel",() -> new ShovelItem(AltTiers.Dendrite, 1.5f, -3.0f, new Item.Properties()) );
-	public static final RegistryObject<Item> dendrite_hoe = VANILLA_ITEMS.register("netherite_hoe",() -> new HoeItem(AltTiers.Dendrite, -1, -1.0f, new Item.Properties()) );
+	public static final RegistryObject<Item> dendrite_hoe = VANILLA_ITEMS.register("netherite_hoe",() -> new PickaxeItem(AltTiers.Dendrite, -1, -1.0f, new Item.Properties()) );
 
 	public static final RegistryObject<Block> acoustic_plush = BLOCKS.register("acoustic_plush", () -> new PlushBlock(BlockBehaviour.Properties.of().mapColor(MapColor.DIRT).noOcclusion()));
 	public static final RegistryObject<Block> emerald_plush = BLOCKS.register("emerald_plush", () -> new PlushBlock(BlockBehaviour.Properties.of().mapColor(MapColor.LAPIS).noOcclusion()));
@@ -101,59 +94,16 @@ public class MC_Rebalance
 			}).build());
 	*/
 
-	// If this modpack were to be in development any longer this would go in a new file
-	/*public static RegistryObject<Item> quickSimpleFoodRepacement(String id, Integer nutrition, Float saturation){
-		return VANILLA_ITEMS.register(id, () -> new Item(new Item.Properties().food(new FoodProperties.Builder()
-						.alwaysEat()
-						.nutrition(nutrition)
-						.saturationMod(saturation)
-						.build()
-		)));
-	}
-	public static final RegistryObject<Item> steak = quickSimpleFoodReplacement("cooked_beef",5,0.4f);
-	*/
-	
 	public static final RegistryObject<Item> steak = VANILLA_ITEMS.register("cooked_beef", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(5).saturationMod(0.4f).build())));
 	
-	public static final RegistryObject<Item> bread = VANILLA_ITEMS.register("bread", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(3).saturationMod(0.4f).build())));
-
-	public static final RegistryObject<Item> carrot = VANILLA_ITEMS.register("carrot", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(2).saturationMod(0.5f).build())));
-
-	public static final RegistryObject<Item> raw_rabbit = VANILLA_ITEMS.register("rabbit", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(2).saturationMod(1.0f).build())));
-
-	public static final RegistryObject<Item> glow_berries = VANILLA_ITEMS.register("glow_berries", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(2).saturationMod(2.0f).build())));
-
-	public static final RegistryObject<Item> cookie = VANILLA_ITEMS.register("cookie", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(1).saturationMod(2.6f).build())));
-
-	public static final RegistryObject<Item> dried_kelp = VANILLA_ITEMS.register("dried_kelp", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(2).saturationMod(0.0f).build())));
-
-	public static final RegistryObject<Item> cooked_chicken = VANILLA_ITEMS.register("cooked_chicken", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(5).saturationMod(0.4f).build())));
-
-	public static final RegistryObject<Item> cooked_salmon = VANILLA_ITEMS.register("cooked_salmon", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(6).saturationMod(0.2f).build())));
-
-	public static final RegistryObject<Item> cooked_cod = VANILLA_ITEMS.register("cooked_cod", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(5).saturationMod(0.2f).build())));
-
-	public static final RegistryObject<Item> cooked_porkchop = VANILLA_ITEMS.register("cooked_porkchop", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(8).saturationMod(0.7f).build())));
-
-	public static final RegistryObject<Item> golden_carrot = VANILLA_ITEMS.register("golden_carrot", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(2).saturationMod(2.5f).build())));
-
-	public static final RegistryObject<Item> pumpkin_pie = VANILLA_ITEMS.register("pumpkin_pie", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(6).saturationMod(1.1f).build())));
-
-	public static final RegistryObject<Item> cooked_mutton = VANILLA_ITEMS.register("cooked_mutton", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(5).saturationMod(0.6f).build())));
-	
-	// The following will need additional alterations to function correctly
-	/*
-	public static final RegistryObject<Item> rotten_flesh = VANILLA_ITEMS.register("rotten_flesh", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(5).saturationMod(0.4f).build())));
-	
-	 public static final RegistryObject<Item> chorus_fruit = VANILLA_ITEMS.register("chorus_fruit", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(5).saturationMod(0.4f).build())));
-	*/
+	// public static final RegistryObject<Item> chorus_fruit = VANILLA_ITEMS.register("chorus_fruit", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(5).saturationMod(0.4f).build())));
 
 	public MC_Rebalance(FMLJavaModLoadingContext context)
 	{
 		IEventBus modEventBus = context.getModEventBus();
 
 		// Register the commonSetup method for modloading
-		//modEventBus.addListener(this::commonSetup);
+		modEventBus.addListener(this::commonSetup);
 
 		// Register the Deferred Register to the mod event bus so blocks get registered
 		BLOCKS.register(modEventBus);
@@ -175,7 +125,7 @@ public class MC_Rebalance
 		context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
 	}
 
-	/*private void commonSetup(final FMLCommonSetupEvent event)
+	private void commonSetup(final FMLCommonSetupEvent event)
 	{
 		// Some common setup code
 		LOGGER.info("HELLO FROM COMMON SETUP");
@@ -185,7 +135,7 @@ public class MC_Rebalance
 		LOGGER.info(Config.magicNumberIntroduction + Config.magicNumber);
 
 		Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString()));
-	}*/
+	}
 
 	// Add the example block item to the building blocks tab
 	private void addCreative(BuildCreativeModeTabContentsEvent event)

src/main/resources/assets/mc_rebalance/lang/en_us.json

@@ -1,8 +1,4 @@
 {
 	"block.mc_rebalance.acoustic_plush":"Acoustic Plush",
-	"block.mc_rebalance.emerald_plush":"Emerald Plush",
-	"advancements.end.thanks_sarge.title":"Proof of Thanks",
-	"advancements.end.thanks_sarge.description":"Earn a developer item for your hard work",
-	"advancements.nether.thanks_emerald.title":"Thank You and Farewell",
-	"advancements.nether.thanks_emerald.description":"Kill the Wither and earn a developer item"
+	"block.mc_rebalance.emerald_plush":"Emerald Plush"
 }

src/main/resources/assets/mc_rebalance/models/block/acoustic_plush.json

@@ -1,6 +1,133 @@
 {
-	"parent": "mc_rebalance:block/plush",
+	"format_version": "1.9.0",
+	"credit": "Made with Blockbench",
 	"textures": {
-		"plush": "mc_rebalance:block/acoustic_plush"
+		"0": "mc_rebalance:block/acoustic_plush",
+		"particle": "mc_rebalance:block/acoustic_plush"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [6, 3, 7],
+			"to": [10, 7, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 8]},
+			"faces": {
+				"north": {"uv": [5.5, 6.5, 6.5, 7.5], "texture": "#0"},
+				"east": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"},
+				"south": {"uv": [5.5, 13.5, 6.5, 14.5], "texture": "#0"},
+				"west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#missing"},
+				"down": {"uv": [7.5, 4, 8.9375, 4.875], "texture": "#0"}
+			}
+		},
+		{
+			"name": "head",
+			"from": [4, 7, 5],
+			"to": [12, 15, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]},
+			"faces": {
+				"north": {"uv": [2, 2, 4, 4], "texture": "#0"},
+				"east": {"uv": [0, 2, 2, 4], "texture": "#0"},
+				"south": {"uv": [6, 2, 8, 4], "texture": "#0"},
+				"west": {"uv": [4, 2, 6, 4], "texture": "#0"},
+				"up": {"uv": [2, 0, 4, 2], "texture": "#0"},
+				"down": {"uv": [4, 0, 6, 2], "texture": "#0"}
+			}
+		},
+		{
+			"name": "armr",
+			"from": [9, 3, 7.5],
+			"to": [17, 6, 10.5],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [14, 6, 8.5]},
+			"faces": {
+				"north": {"uv": [10.75, 6, 11.5, 8], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [11.5, 6, 12.25, 8], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [0, 0, 3, 6], "texture": "#missing"},
+				"up": {"uv": [10, 6, 10.75, 8], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [12.25, 6, 13, 8], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "arml",
+			"from": [-1, 3, 7.5],
+			"to": [7, 6, 10.5],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [2, 6, 8.5]},
+			"faces": {
+				"north": {"uv": [10.75, 8, 11.5, 6], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [3, 0, 0, 6], "texture": "#missing"},
+				"south": {"uv": [11.5, 8, 12.25, 6], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [13, 4, 12, 5], "rotation": 180, "texture": "#0"},
+				"up": {"uv": [10, 8, 10.75, 6], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [12.25, 8, 13, 6], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "legr",
+			"from": [9, 0, 3],
+			"to": [12, 3, 10],
+			"rotation": {"angle": -22.5, "axis": "y", "origin": [10, 5, 6]},
+			"faces": {
+				"north": {"uv": [2, 4, 3, 5], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [3.25, 6.25, 4, 8], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [1, 4, 1.75, 4.75], "texture": "#0"},
+				"west": {"uv": [2.5, 6.25, 3.25, 8], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [1.75, 6.25, 2.5, 8], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [1, 6.25, 1.75, 8], "texture": "#0"}
+			}
+		},
+		{
+			"name": "legl",
+			"from": [4, 0, 3],
+			"to": [7, 3, 10],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [6, 5, 6]},
+			"faces": {
+				"north": {"uv": [3, 4, 2, 5], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [2.5, 8, 3.25, 6.25], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [1.75, 4, 1, 4.75], "texture": "#0"},
+				"west": {"uv": [3.25, 8, 4, 6.25], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [2.5, 6.25, 1.75, 8], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [1.75, 6.25, 1, 8], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 50, 0],
+			"translation": [-1.75, 0, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, 50, 0],
+			"translation": [-1.75, 0, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [-13, 142, 0],
+			"translation": [0, 3.25, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-13, 142, 0],
+			"translation": [0, 3.25, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"ground": {
+			"rotation": [38, 0, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"gui": {
+			"rotation": [30, 146, 9],
+			"translation": [0, 0.25, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"head": {
+			"translation": [0, 14, 0]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -7]
+		}
 	}
 }

src/main/resources/assets/mc_rebalance/models/block/emerald_plush.json

@@ -1,6 +1,133 @@
 {
-	"parent": "mc_rebalance:block/plush",
+	"format_version": "1.9.0",
+	"credit": "Made with Blockbench",
 	"textures": {
-		"plush": "mc_rebalance:block/emerald_plush"
+		"0": "mc_rebalance:block/emerald_plush",
+		"particle": "mc_rebalance:block/emerald_plush"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [6, 3, 7],
+			"to": [10, 7, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 8]},
+			"faces": {
+				"north": {"uv": [5.5, 6.5, 6.5, 7.5], "texture": "#0"},
+				"east": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"},
+				"south": {"uv": [5.5, 13.5, 6.5, 14.5], "texture": "#0"},
+				"west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#missing"},
+				"down": {"uv": [7.5, 4, 8.9375, 4.875], "texture": "#0"}
+			}
+		},
+		{
+			"name": "head",
+			"from": [4, 7, 5],
+			"to": [12, 15, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]},
+			"faces": {
+				"north": {"uv": [2, 2, 4, 4], "texture": "#0"},
+				"east": {"uv": [0, 2, 2, 4], "texture": "#0"},
+				"south": {"uv": [6, 2, 8, 4], "texture": "#0"},
+				"west": {"uv": [4, 2, 6, 4], "texture": "#0"},
+				"up": {"uv": [2, 0, 4, 2], "texture": "#0"},
+				"down": {"uv": [4, 0, 6, 2], "texture": "#0"}
+			}
+		},
+		{
+			"name": "armr",
+			"from": [9, 3, 7.5],
+			"to": [17, 6, 10.5],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [14, 6, 8.5]},
+			"faces": {
+				"north": {"uv": [10.75, 6, 11.5, 8], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [11.5, 6, 12.25, 8], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [0, 0, 3, 6], "texture": "#missing"},
+				"up": {"uv": [10, 6, 10.75, 8], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [12.25, 6, 13, 8], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "arml",
+			"from": [-1, 3, 7.5],
+			"to": [7, 6, 10.5],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [2, 6, 8.5]},
+			"faces": {
+				"north": {"uv": [10.75, 8, 11.5, 6], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [3, 0, 0, 6], "texture": "#missing"},
+				"south": {"uv": [11.5, 8, 12.25, 6], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [13, 4, 12, 5], "rotation": 180, "texture": "#0"},
+				"up": {"uv": [10, 8, 10.75, 6], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [12.25, 8, 13, 6], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "legr",
+			"from": [9, 0, 3],
+			"to": [12, 3, 10],
+			"rotation": {"angle": -22.5, "axis": "y", "origin": [10, 5, 6]},
+			"faces": {
+				"north": {"uv": [2, 4, 3, 5], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [3.25, 6.25, 4, 8], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [1, 4, 1.75, 4.75], "texture": "#0"},
+				"west": {"uv": [2.5, 6.25, 3.25, 8], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [1.75, 6.25, 2.5, 8], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [1, 6.25, 1.75, 8], "texture": "#0"}
+			}
+		},
+		{
+			"name": "legl",
+			"from": [4, 0, 3],
+			"to": [7, 3, 10],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [6, 5, 6]},
+			"faces": {
+				"north": {"uv": [3, 4, 2, 5], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [2.5, 8, 3.25, 6.25], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [1.75, 4, 1, 4.75], "texture": "#0"},
+				"west": {"uv": [3.25, 8, 4, 6.25], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [2.5, 6.25, 1.75, 8], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [1.75, 6.25, 1, 8], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 50, 0],
+			"translation": [-1.75, 0, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, 50, 0],
+			"translation": [-1.75, 0, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [-13, 142, 0],
+			"translation": [0, 3.25, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-13, 142, 0],
+			"translation": [0, 3.25, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"ground": {
+			"rotation": [38, 0, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"gui": {
+			"rotation": [30, 146, 9],
+			"translation": [0, 0.25, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"head": {
+			"translation": [0, 14, 0]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -7]
+		}
 	}
 }

src/main/resources/assets/mc_rebalance/models/block/plush.json

@@ -1,132 +0,0 @@
-{
-	"format_version": "1.9.0",
-	"credit": "Made with Blockbench",
-	"textures": {
-		"particle": "minecraft:block/soul_sand"
-	},
-	"elements": [
-		{
-			"name": "body",
-			"from": [6, 3, 7],
-			"to": [10, 7, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 8]},
-			"faces": {
-				"north": {"uv": [5.5, 6.5, 6.5, 7.5], "texture": "#plush"},
-				"east": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#plush"},
-				"south": {"uv": [5.5, 13.5, 6.5, 14.5], "texture": "#plush"},
-				"west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#plush"},
-				"up": {"uv": [0, 0, 4, 4], "texture": "#missing"},
-				"down": {"uv": [7.5, 4, 8.9375, 4.875], "texture": "#plush"}
-			}
-		},
-		{
-			"name": "head",
-			"from": [4, 7, 5],
-			"to": [12, 15, 13],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]},
-			"faces": {
-				"north": {"uv": [2, 2, 4, 4], "texture": "#plush"},
-				"east": {"uv": [0, 2, 2, 4], "texture": "#plush"},
-				"south": {"uv": [6, 2, 8, 4], "texture": "#plush"},
-				"west": {"uv": [4, 2, 6, 4], "texture": "#plush"},
-				"up": {"uv": [2, 0, 4, 2], "texture": "#plush"},
-				"down": {"uv": [4, 0, 6, 2], "texture": "#plush"}
-			}
-		},
-		{
-			"name": "armr",
-			"from": [9, 3, 7.5],
-			"to": [17, 6, 10.5],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [14, 6, 8.5]},
-			"faces": {
-				"north": {"uv": [10.75, 6, 11.5, 8], "rotation": 90, "texture": "#plush"},
-				"east": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#plush"},
-				"south": {"uv": [11.5, 6, 12.25, 8], "rotation": 270, "texture": "#plush"},
-				"west": {"uv": [0, 0, 3, 6], "texture": "#missing"},
-				"up": {"uv": [10, 6, 10.75, 8], "rotation": 270, "texture": "#plush"},
-				"down": {"uv": [12.25, 6, 13, 8], "rotation": 270, "texture": "#plush"}
-			}
-		},
-		{
-			"name": "arml",
-			"from": [-1, 3, 7.5],
-			"to": [7, 6, 10.5],
-			"rotation": {"angle": 22.5, "axis": "z", "origin": [2, 6, 8.5]},
-			"faces": {
-				"north": {"uv": [10.75, 8, 11.5, 6], "rotation": 90, "texture": "#plush"},
-				"east": {"uv": [3, 0, 0, 6], "texture": "#missing"},
-				"south": {"uv": [11.5, 8, 12.25, 6], "rotation": 270, "texture": "#plush"},
-				"west": {"uv": [13, 4, 12, 5], "rotation": 180, "texture": "#plush"},
-				"up": {"uv": [10, 8, 10.75, 6], "rotation": 270, "texture": "#plush"},
-				"down": {"uv": [12.25, 8, 13, 6], "rotation": 270, "texture": "#plush"}
-			}
-		},
-		{
-			"name": "legr",
-			"from": [9, 0, 3],
-			"to": [12, 3, 10],
-			"rotation": {"angle": -22.5, "axis": "y", "origin": [10, 5, 6]},
-			"faces": {
-				"north": {"uv": [2, 4, 3, 5], "rotation": 180, "texture": "#plush"},
-				"east": {"uv": [3.25, 6.25, 4, 8], "rotation": 270, "texture": "#plush"},
-				"south": {"uv": [1, 4, 1.75, 4.75], "texture": "#plush"},
-				"west": {"uv": [2.5, 6.25, 3.25, 8], "rotation": 90, "texture": "#plush"},
-				"up": {"uv": [1.75, 6.25, 2.5, 8], "rotation": 180, "texture": "#plush"},
-				"down": {"uv": [1, 6.25, 1.75, 8], "texture": "#plush"}
-			}
-		},
-		{
-			"name": "legl",
-			"from": [4, 0, 3],
-			"to": [7, 3, 10],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [6, 5, 6]},
-			"faces": {
-				"north": {"uv": [3, 4, 2, 5], "rotation": 180, "texture": "#plush"},
-				"east": {"uv": [2.5, 8, 3.25, 6.25], "rotation": 90, "texture": "#plush"},
-				"south": {"uv": [1.75, 4, 1, 4.75], "texture": "#plush"},
-				"west": {"uv": [3.25, 8, 4, 6.25], "rotation": 270, "texture": "#plush"},
-				"up": {"uv": [2.5, 6.25, 1.75, 8], "rotation": 180, "texture": "#plush"},
-				"down": {"uv": [1.75, 6.25, 1, 8], "texture": "#plush"}
-			}
-		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"rotation": [0, 50, 0],
-			"translation": [-1.75, 0, 0],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"thirdperson_lefthand": {
-			"rotation": [0, 50, 0],
-			"translation": [-1.75, 0, 0],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"firstperson_righthand": {
-			"rotation": [-13, 142, 0],
-			"translation": [0, 3.25, 0],
-			"scale": [0.6, 0.6, 0.6]
-		},
-		"firstperson_lefthand": {
-			"rotation": [-13, 142, 0],
-			"translation": [0, 3.25, 0],
-			"scale": [0.6, 0.6, 0.6]
-		},
-		"ground": {
-			"rotation": [38, 0, 0],
-			"translation": [0, 2.5, 0],
-			"scale": [0.5, 0.5, 0.5]
-		},
-		"gui": {
-			"rotation": [30, 146, 9],
-			"translation": [0, 0.25, 0],
-			"scale": [0.8, 0.8, 0.8]
-		},
-		"head": {
-			"translation": [0, 14, 0]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [0, 0, -7]
-		}
-	}
-}

src/main/resources/assets/mc_rebalance/models/item/acoustic_plush.json

@@ -1,3 +1,133 @@
 {
-  "parent": "mc_rebalance:block/acoustic_plush"
+	"format_version": "1.9.0",
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "mc_rebalance:block/acoustic_plush",
+		"particle": "mc_rebalance:block/acoustic_plush"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [6, 3, 7],
+			"to": [10, 7, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 8]},
+			"faces": {
+				"north": {"uv": [5.5, 6.5, 6.5, 7.5], "texture": "#0"},
+				"east": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"},
+				"south": {"uv": [5.5, 13.5, 6.5, 14.5], "texture": "#0"},
+				"west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#missing"},
+				"down": {"uv": [7.5, 4, 8.9375, 4.875], "texture": "#0"}
+			}
+		},
+		{
+			"name": "head",
+			"from": [4, 7, 5],
+			"to": [12, 15, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]},
+			"faces": {
+				"north": {"uv": [2, 2, 4, 4], "texture": "#0"},
+				"east": {"uv": [0, 2, 2, 4], "texture": "#0"},
+				"south": {"uv": [6, 2, 8, 4], "texture": "#0"},
+				"west": {"uv": [4, 2, 6, 4], "texture": "#0"},
+				"up": {"uv": [2, 0, 4, 2], "texture": "#0"},
+				"down": {"uv": [4, 0, 6, 2], "texture": "#0"}
+			}
+		},
+		{
+			"name": "armr",
+			"from": [9, 3, 7.5],
+			"to": [17, 6, 10.5],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [14, 6, 8.5]},
+			"faces": {
+				"north": {"uv": [10.75, 6, 11.5, 8], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [11.5, 6, 12.25, 8], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [0, 0, 3, 6], "texture": "#missing"},
+				"up": {"uv": [10, 6, 10.75, 8], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [12.25, 6, 13, 8], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "arml",
+			"from": [-1, 3, 7.5],
+			"to": [7, 6, 10.5],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [2, 6, 8.5]},
+			"faces": {
+				"north": {"uv": [10.75, 8, 11.5, 6], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [3, 0, 0, 6], "texture": "#missing"},
+				"south": {"uv": [11.5, 8, 12.25, 6], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [13, 4, 12, 5], "rotation": 180, "texture": "#0"},
+				"up": {"uv": [10, 8, 10.75, 6], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [12.25, 8, 13, 6], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "legr",
+			"from": [9, 0, 3],
+			"to": [12, 3, 10],
+			"rotation": {"angle": -22.5, "axis": "y", "origin": [10, 5, 6]},
+			"faces": {
+				"north": {"uv": [2, 4, 3, 5], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [3.25, 6.25, 4, 8], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [1, 4, 1.75, 4.75], "texture": "#0"},
+				"west": {"uv": [2.5, 6.25, 3.25, 8], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [1.75, 6.25, 2.5, 8], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [1, 6.25, 1.75, 8], "texture": "#0"}
+			}
+		},
+		{
+			"name": "legl",
+			"from": [4, 0, 3],
+			"to": [7, 3, 10],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [6, 5, 6]},
+			"faces": {
+				"north": {"uv": [3, 4, 2, 5], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [2.5, 8, 3.25, 6.25], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [1.75, 4, 1, 4.75], "texture": "#0"},
+				"west": {"uv": [3.25, 8, 4, 6.25], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [2.5, 6.25, 1.75, 8], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [1.75, 6.25, 1, 8], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 50, 0],
+			"translation": [-1.75, 0, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, 50, 0],
+			"translation": [-1.75, 0, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [-13, 142, 0],
+			"translation": [0, 3.25, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-13, 142, 0],
+			"translation": [0, 3.25, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"ground": {
+			"rotation": [38, 0, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"gui": {
+			"rotation": [30, 146, 9],
+			"translation": [0, 0.25, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"head": {
+			"translation": [0, 14, 0]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -7]
+		}
+	}
 }

src/main/resources/assets/mc_rebalance/models/item/emerald_plush.json

@@ -1,3 +1,133 @@
 {
-  "parent": "mc_rebalance:block/emerald_plush"
+	"format_version": "1.9.0",
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "mc_rebalance:block/emerald_plush",
+		"particle": "mc_rebalance:block/emerald_plush"
+	},
+	"elements": [
+		{
+			"name": "body",
+			"from": [6, 3, 7],
+			"to": [10, 7, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 8]},
+			"faces": {
+				"north": {"uv": [5.5, 6.5, 6.5, 7.5], "texture": "#0"},
+				"east": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"},
+				"south": {"uv": [5.5, 13.5, 6.5, 14.5], "texture": "#0"},
+				"west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#missing"},
+				"down": {"uv": [7.5, 4, 8.9375, 4.875], "texture": "#0"}
+			}
+		},
+		{
+			"name": "head",
+			"from": [4, 7, 5],
+			"to": [12, 15, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]},
+			"faces": {
+				"north": {"uv": [2, 2, 4, 4], "texture": "#0"},
+				"east": {"uv": [0, 2, 2, 4], "texture": "#0"},
+				"south": {"uv": [6, 2, 8, 4], "texture": "#0"},
+				"west": {"uv": [4, 2, 6, 4], "texture": "#0"},
+				"up": {"uv": [2, 0, 4, 2], "texture": "#0"},
+				"down": {"uv": [4, 0, 6, 2], "texture": "#0"}
+			}
+		},
+		{
+			"name": "armr",
+			"from": [9, 3, 7.5],
+			"to": [17, 6, 10.5],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [14, 6, 8.5]},
+			"faces": {
+				"north": {"uv": [10.75, 6, 11.5, 8], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [11.5, 6, 12.25, 8], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [0, 0, 3, 6], "texture": "#missing"},
+				"up": {"uv": [10, 6, 10.75, 8], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [12.25, 6, 13, 8], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "arml",
+			"from": [-1, 3, 7.5],
+			"to": [7, 6, 10.5],
+			"rotation": {"angle": 22.5, "axis": "z", "origin": [2, 6, 8.5]},
+			"faces": {
+				"north": {"uv": [10.75, 8, 11.5, 6], "rotation": 90, "texture": "#0"},
+				"east": {"uv": [3, 0, 0, 6], "texture": "#missing"},
+				"south": {"uv": [11.5, 8, 12.25, 6], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [13, 4, 12, 5], "rotation": 180, "texture": "#0"},
+				"up": {"uv": [10, 8, 10.75, 6], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [12.25, 8, 13, 6], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"name": "legr",
+			"from": [9, 0, 3],
+			"to": [12, 3, 10],
+			"rotation": {"angle": -22.5, "axis": "y", "origin": [10, 5, 6]},
+			"faces": {
+				"north": {"uv": [2, 4, 3, 5], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [3.25, 6.25, 4, 8], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [1, 4, 1.75, 4.75], "texture": "#0"},
+				"west": {"uv": [2.5, 6.25, 3.25, 8], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [1.75, 6.25, 2.5, 8], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [1, 6.25, 1.75, 8], "texture": "#0"}
+			}
+		},
+		{
+			"name": "legl",
+			"from": [4, 0, 3],
+			"to": [7, 3, 10],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [6, 5, 6]},
+			"faces": {
+				"north": {"uv": [3, 4, 2, 5], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [2.5, 8, 3.25, 6.25], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [1.75, 4, 1, 4.75], "texture": "#0"},
+				"west": {"uv": [3.25, 8, 4, 6.25], "rotation": 270, "texture": "#0"},
+				"up": {"uv": [2.5, 6.25, 1.75, 8], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [1.75, 6.25, 1, 8], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 50, 0],
+			"translation": [-1.75, 0, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, 50, 0],
+			"translation": [-1.75, 0, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [-13, 142, 0],
+			"translation": [0, 3.25, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-13, 142, 0],
+			"translation": [0, 3.25, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"ground": {
+			"rotation": [38, 0, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"gui": {
+			"rotation": [30, 146, 9],
+			"translation": [0, 0.25, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"head": {
+			"translation": [0, 14, 0]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -7]
+		}
+	}
 }

src/main/resources/assets/minecraft/lang/en_us.json

@@ -0,0 +1,33 @@
+{
+    "advancements.husbandry.netherite_hoe.description": "Use a Dendrite Ingot to upgrade a Hoe, and then reevaluate your life choices",
+    "advancements.husbandry.netherite_hoe.title": "Serious Dedication",
+    "advancements.nether.netherite_armor.description": "Get a full suit of Dendrite armor",
+    "advancements.story.mine_diamond.description": "Lost in light and heat",
+    "advancements.story.mine_diamond.title": "Hearts of the Sunrise",
+    "advancements.story.wooden_paxel.description": "Craft a Wooden Paxel",
+    "advancements.story.wooden_paxel.title": "A New Beginning",
+    "block.minecraft.deepslate_diamond_ore": "Blackstone Diamond Ore",
+    "block.minecraft.netherite_block": "Block of Dendrite",
+    "item.minecraft.netherite_axe": "Dendrite Axe",
+    "item.minecraft.netherite_boots": "Dendrite Boots",
+    "item.minecraft.netherite_chestplate": "Dendrite Chestplate",
+    "item.minecraft.netherite_helmet": "Dendrite Helmet",
+    "item.minecraft.netherite_hoe": "Dendrite Hoe",
+    "item.minecraft.netherite_ingot": "Dendrite Ingot",
+    "item.minecraft.netherite_leggings": "Dendrite Leggings",
+    "item.minecraft.netherite_pickaxe": "Dendrite Pickaxe",
+    "item.minecraft.netherite_scrap": "Dendrite Shale",
+    "item.minecraft.netherite_shovel": "Dendrite Shovel",
+    "item.minecraft.netherite_sword": "Dendrite Sword",
+    "item.minecraft.netherite_upgrade_smithing_template.new": "Dendrite Upgrade",
+    "item.minecraft.smithing_template.netherite_upgrade.additions_slot_description": "Add Dendrite Ingot",
+    "item.minecraft.smithing_template.netherite_upgrade.ingredients": "Dendrite Ingot",
+    "item.minecraft.stone_axe": "Copper Axe",
+    "item.minecraft.stone_hoe": "Copper Hoe",
+    "item.minecraft.stone_pickaxe": "Copper Pickaxe",
+    "item.minecraft.stone_shovel": "Copper Shovel",
+    "item.minecraft.stone_sword": "Copper Sword",
+    "subtitles.item.armor.equip_netherite": "Dendrite armor clanks",
+    "trim_material.minecraft.netherite": "Dendrite Material",
+    "upgrade.minecraft.netherite_upgrade": "Dendrite Upgrade"
+}

src/main/resources/assets/minecraft/lang/gen-langs.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Simply copies en_us.json to other standard english variants
+
+for lang in gb au ca nz pt ud; do
+	cp en_us.json "en_${lang}.json";
+done

src/main/resources/assets/paxelsfordummies/lang/en_us.json

@@ -0,0 +1,4 @@
+{
+  "item.paxelsfordummies.stone_paxel": "Copper Paxel",
+  "item.paxelsfordummies.netherite_paxel": "Dendrite Paxel"
+}

src/main/resources/assets/tconstruct/lang/en_us.json

@@ -0,0 +1,17 @@
+{
+    "block.tconstruct.molten_netherite_fluid": "Molten Dendrite",
+    "fluid.tconstruct.flowing_molten_netherite": "Flowing Molten Dendrite",
+    "fluid.tconstruct.molten_netherite": "Molten Dendrite",
+    "fluid.tconstruct.molten_netherite.fluid_effect": "Molten dendrite is the highest base damage, for when you cannot wait for your target to bleed out.",
+    "advancements.tconstruct.tools.netherite_tier.description": "Create a tool with the dendrite mining tier",
+    "advancements.tconstruct.tools.netherite_tier.title": "Dendrite Tier",
+    "item.tconstruct.debris_nugget.tooltip": "Small shard of ancient dendrite, possibly can be melted to salvage",
+    "item.tconstruct.molten_netherite_bucket": "Molten Dendrite Bucket",
+    "item.tconstruct.netherite_item_frame": "Dendrite Item Frame",
+    "item.tconstruct.netherite_nugget": "Dendrite Nugget",
+    "material.tconstruct.netherite":  "Dendrite",
+    "modifier.tconstruct.netherite": "Dendrite",
+    "modifier.tconstruct.unbreakable.requirements": "Unbreakable requires Dendrite and Reinforced V to apply",
+    "modifier.tconstruct.worldbound.description": "A crude version of dendrite, granting immunity to external damage like fire, but no additional strength",
+    "stat.tconstruct.harvest_tier.minecraft.netherite": "Dendrite"
+}

src/main/resources/assets/tetra/lang/en_us.json

@@ -0,0 +1,44 @@
+{
+  "tetra.advancements.story.more_upgrades.description": "Craft a copper hammer from two sticks and two copper ingots\n \n§8§oTetra begins",
+  "tetra.advancements.upgrades.hammer_3.title": "Hammer II (Iron)",
+  "tetra.advancements.upgrades.hammer_4.title": "Hammer III (Blackstone)",
+  "tetra.advancements.upgrades.hammer_5.title": "Hammer IV (Obsidian)",
+  "tetra.advancements.upgrades.hammer_6.description": "Craft a double-sided dendrite hammer using a fully upgraded forge hammer, the dendrite hammer provides tier six hammering capabilities",
+  "tetra.advancements.upgrades.hammer_6.title": "Hammer V (Dendrite)",
+  "tetra.advancements.upgrades.root.description": "Craft a mallet from two sticks and two copper ingots\n \nItem Reward: Holosphere",
+  "tetra.material.netherite": "Dendrite",
+  "tetra.material.netherite.prefix": "Dendrite",
+  "tetra.variant.spike/netherite": "Dendrite spike",
+  "tetra.material.feature.slimesteel": "Slimesteel",
+  "tetra.material.feature.slimesteel.tooltip": "Slimesteel",
+  "tetra.material.slimesteel": "Slimesteel",
+  "tetra.material.slimesteel.prefix": "Slimesteel",
+  "tetra.material.feature.cobalt": "Cobalt",
+  "tetra.material.feature.cobalt.tooltip": "Cobalt",
+  "tetra.material.cobalt": "Cobalt",
+  "tetra.material.cobalt.prefix": "Cobalt",
+  "tetra.material.feature.queens_slime": "Queen's Slime",
+  "tetra.material.feature.queens_slime.tooltip": "Queen's Slime",
+  "tetra.material.queens_slime": "Queen's Slime",
+  "tetra.material.queens_slime.prefix": "Queen's Slime",
+  "tetra.material.feature.steel": "Steel",
+  "tetra.material.feature.steel.tooltip": "Steel",
+  "tetra.material.steel": "Steel",
+  "tetra.material.steel.prefix": "Steel",
+  "tetra.material.feature.amethyst_bronze": "Amethyst Bronze",
+  "tetra.material.feature.amethyst_bronze.tooltip": "Amethyst Bronze",
+  "tetra.material.amethyst_bronze": "Amethyst Bronze",
+  "tetra.material.amethyst_bronze.prefix": "Amethyst Bronze",
+  "tetra.material.feature.hepatizon": "Hepatizon",
+  "tetra.material.feature.hepatizon.tooltip": "Hepatizon",
+  "tetra.material.hepatizon": "Hepatizon",
+  "tetra.material.hepatizon.prefix": "Hepatizon",
+  "tetra.material.feature.manyullyn": "Manyullyn",
+  "tetra.material.feature.manyullyn.tooltip": "Manyullyn",
+  "tetra.material.manyullyn": "Manyullyn",
+  "tetra.material.manyullyn.prefix": "Manyullyn",
+  "tetra.material.feature.rose_gold": "Rose Gold",
+  "tetra.material.feature.rose_gold.tooltip": "Rose Gold",
+  "tetra.material.rose_gold": "Rose Gold",
+  "tetra.material.rose_gold.prefix": "Rose Gold"
+}

src/main/resources/data/advanced_copper/recipes/copper_axe_recipe.json

@@ -0,0 +1 @@
+{}

src/main/resources/data/advanced_copper/recipes/copper_excavator_recipe.json

@@ -0,0 +1 @@
+{}

src/main/resources/data/advanced_copper/recipes/copper_hamer_recipe.json

@@ -0,0 +1 @@
+{}

src/main/resources/data/advanced_copper/recipes/copper_hoe_recipe.json

@@ -0,0 +1 @@
+{}

src/main/resources/data/advanced_copper/recipes/copper_paxel_recipe.json

@@ -0,0 +1 @@
+{}

src/main/resources/data/advanced_copper/recipes/copper_pickaxe_recipe.json

@@ -0,0 +1 @@
+{}

src/main/resources/data/advanced_copper/recipes/copper_shovel_recipe.json

@@ -0,0 +1 @@
+{}

src/main/resources/data/advanced_copper/recipes/copper_sword_recipe.json

@@ -0,0 +1 @@
+{}

src/main/resources/data/endercon/worldgen/structure/end_ruins.json

@@ -0,0 +1,15 @@
+
+{
+	"type": "minecraft:jigsaw",
+	"biomes": "endercon:end_hallows",
+	"step": "raw_generation",
+	"spawn_overrides": {},
+	"terrain_adaptation": "none",
+	"start_pool": "endercon:end_ruins/start",
+	"size": 2,
+	"start_height": {
+		"absolute": 30
+	},
+	"max_distance_from_center": 16,
+	"use_expansion_hack": false
+}

src/main/resources/data/mc_rebalance/advancements/altered_metal.json

@@ -0,0 +1,16 @@
+{
+	"display": {
+		"icon": {"item": "minecraft:netherite_block"},
+		"title": "Altered Metal",
+		"description": "The world is not as it was",
+		"background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
+		"frame": "task",
+		"show_toast": false,
+		"announce_to_chat": false
+	},
+	"criteria": {
+		"givenow": {
+			"trigger": "minecraft:tick"
+		}
+	}
+}

src/main/resources/data/mc_rebalance/advancements/better_than_another_rose.json

@@ -0,0 +1,19 @@
+{
+	"parent":"mc_rebalance:the_farmer_was_replaced",
+	"display": {
+		"icon": {"item": "minecraft:gold_ingot"},
+		"title": "Better Than Another Rose Gold",
+		"description": "Hold on. Is this really gold?",		
+		"frame": "task",
+		"show_toast": true,
+		"announce_to_chat": true
+	},
+	"criteria": {
+		"givenow": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items":[{"items":["minecraft:gold_ingot"]}]
+			}
+		}
+	}
+}

src/main/resources/data/mc_rebalance/advancements/cause_and_effect.json

@@ -0,0 +1,19 @@
+{
+	"parent":"mc_rebalance:colliding_stars",
+	"display": {
+		"icon": {"item": "minecraft:netherite_scrap"},
+		"title": "Cause to Cause, Effect to Effect",
+		"description": "Find your first sheaf of dendrite",		
+		"frame": "task",
+		"show_toast": true,
+		"announce_to_chat": true
+	},
+	"criteria": {
+		"givenow": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items":[{"items":["minecraft:netherite_scrap"]}]
+			}
+		}
+	}
+}

src/main/resources/data/mc_rebalance/advancements/colliding_stars.json

@@ -0,0 +1,19 @@
+{
+	"parent":"mc_rebalance:better_than_another_rose",
+	"display":{
+		"icon": {"item": "minecraft:diamond"},
+		"title": "Colliding Stars",
+		"description": "Tell me what their sky holds",		
+		"frame": "task",
+		"show_toast": true,
+		"announce_to_chat": true
+	},
+	"criteria": {
+		"givenow": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items":[{"items":["minecraft:diamond"]}]
+			}
+		}
+	}
+}

src/main/resources/data/mc_rebalance/advancements/really_is_a_trial.json

@@ -0,0 +1,19 @@
+{
+	"parent":"mc_rebalance:altered_metal",
+	"display": {
+		"icon": {"item": "minecraft:stone_pickaxe"},
+		"title": "Really Is a Trial",
+		"description": "Craft your first real upgrade",		
+		"frame": "task",
+		"show_toast": true,
+		"announce_to_chat": true
+	},
+	"criteria": {
+		"givenow": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items":[{"items":["minecraft:stone_pickaxe"]}]
+			}
+		}
+	}
+}

src/main/resources/data/mc_rebalance/advancements/thanks_emerald.json

@@ -1,28 +0,0 @@
-{
-	"parent": "minecraft:nether/summon_wither",
-	"criteria": {
-		"killed_wither": {
-			"conditions": {
-				"entity": [
-					{
-						"condition": "minecraft:entity_properties",
-						"entity": "this",
-						"predicate": {"type": "minecraft:wither"}
-					}
-				]
-			},
-			"trigger": "minecraft:player_killed_entity"
-		}
-	},
-	"display": {
-		"announce_to_chat": true,
-		"description": {"translate": "advancements.nether.thanks_emerald.description"},
-		"frame": "task",
-		"hidden": true,
-		"icon": {"item": "mc_rebalance:emerald_plush"},
-		"show_toast": true,
-		"title": {"translate": "advancements.nether.thanks_emerald.title"}
-	},
-	"requirements": [["killed_wither"]],
-	"rewards":{"loot":["mc_rebalance:blocks/emerald_plush"]}
-}

src/main/resources/data/mc_rebalance/advancements/thanks_sarge.json

@@ -1,28 +0,0 @@
-{
-	"parent": "minecraft:end/kill_dragon",
-	"criteria": {
-		"killed_dragon": {
-			"conditions": {
-				"entity": [
-					{
-						"condition": "minecraft:entity_properties",
-						"entity": "this",
-						"predicate": {"type": "minecraft:ender_dragon"}
-					}
-				]
-			},
-			"trigger": "minecraft:player_killed_entity"
-		}
-	},
-	"display": {
-		"announce_to_chat": true,
-		"description": {"translate": "advancements.end.thanks_sarge.description"},
-		"frame": "task",
-		"hidden": true,
-		"icon": {"item": "mc_rebalance:acoustic_plush"},
-		"show_toast": true,
-		"title": {"translate": "advancements.end.thanks_sarge.title"}
-	},
-	"requirements": [["killed_dragon"]],
-	"rewards":{"loot":["mc_rebalance:blocks/acoustic_plush"]}
-}

src/main/resources/data/mc_rebalance/advancements/the_farmer_was_replaced.json

@@ -0,0 +1,19 @@
+{
+	"parent":"mc_rebalance:really_is_a_trial",
+	"display": {	
+		"icon": {"item": "minecraft:iron_axe"},
+		"title": "The Farmer Was Replaced",
+		"description": "Hard to get anything nowadays",		
+		"frame": "task",
+		"show_toast": true,
+		"announce_to_chat": true
+	},
+	"criteria": {
+		"givenow": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items":[{"items":["minecraft:iron_ingot"]}]
+			}
+		}
+	}
+}

src/main/resources/data/mc_rebalance/loot_tables/blocks/emerald_plush.json

@@ -1,10 +0,0 @@
-{
-    "type": "minecraft:block",
-    "pools": [{
-        "rolls": 1.0,
-        "entries": [{
-            "type": "minecraft:item",
-            "name": "mc_rebalance:emerald_plush"
-        }]
-    }]
-}

src/main/resources/data/mc_rebalance/recipes/copper_nugget_from_blasting.json

@@ -0,0 +1,39 @@
+{
+  "type": "minecraft:blasting",
+  "category": "misc",
+  "cookingtime": 100,
+  "experience": 0.1,
+  "ingredient": [
+    {
+      "item": "minecraft:stone_pickaxe"
+    },
+    {
+      "item": "minecraft:stone_shovel"
+    },
+    {
+      "item": "minecraft:stone_axe"
+    },
+    {
+      "item": "minecraft:stone_hoe"
+    },
+    {
+      "item": "minecraft:stone_sword"
+    },
+    {
+      "item": "paxelsfordummies:stone_paxel"
+    },
+    {
+      "item": "advanced_copper:copper_armor_helmet"
+    },
+    {
+      "item": "advanced_copper:copper_armor_chestplate"
+    },
+    {
+      "item": "advanced_copper:copper_armor_leggings"
+    },
+    {
+      "item": "advanced_copper:copper_armor_boots"
+    }
+  ],
+  "result": "tconstruct:copper_nugget"
+}

src/main/resources/data/mc_rebalance/recipes/copper_nugget_from_smelting.json

@@ -0,0 +1,39 @@
+{
+  "type": "minecraft:smelting",
+  "category": "misc",
+  "cookingtime": 200,
+  "experience": 0.1,
+  "ingredient": [
+    {
+      "item": "minecraft:stone_pickaxe"
+    },
+    {
+      "item": "minecraft:stone_shovel"
+    },
+    {
+      "item": "minecraft:stone_axe"
+    },
+    {
+      "item": "minecraft:stone_hoe"
+    },
+    {
+      "item": "minecraft:stone_sword"
+    },
+    {
+      "item": "paxelsfordummies:stone_paxel"
+    },
+    {
+      "item": "advanced_copper:copper_armor_helmet"
+    },
+    {
+      "item": "advanced_copper:copper_armor_chestplate"
+    },
+    {
+      "item": "advanced_copper:copper_armor_leggings"
+    },
+    {
+      "item": "advanced_copper:copper_armor_boots"
+    }
+  ],
+  "result": "tconstruct:copper_nugget"
+}

src/main/resources/data/mc_rebalance/recipes/rabbit_hide.json

@@ -0,0 +1,12 @@
+{
+	"type": "minecraft:crafting_shapeless",
+	"ingredients": [
+		{
+			"item": "minecraft:leather"
+		}
+	],
+	"result": {
+		"item": "minecraft:rabbit_hide",
+		"count": 4
+	}
+}

src/main/resources/data/mc_rebalance/recipes/sky_slime.json

@@ -0,0 +1,18 @@
+{
+	"type":"tconstruct:alloy",
+	"inputs":[
+		{
+			"tag":"tconstruct:molten_diamond",
+			"amount":90
+		},
+		{
+			"tag":"tconstruct:earth_slime",
+			"amount":720
+		}
+	],
+	"result":{
+		"fluid":"tconstruct:sky_slime",
+		"amount":720
+	},
+	"temperature":1000
+}

src/main/resources/data/minecraft/advancements/story/mine_diamond.json

@@ -0,0 +1,22 @@
+{
+	"parent": "minecraft:story/iron_tools",
+	"criteria": {
+		"diamond": {
+			"conditions": {
+				"items": [{"items": ["minecraft:diamond"]}]
+			},
+			"trigger": "minecraft:inventory_changed"
+		}
+	},
+	"display": {
+		"announce_to_chat": true,
+		"description": "Lost in light and heat",
+		"frame": "task",
+		"hidden": false,
+		"icon": {"item": "minecraft:diamond"},
+		"show_toast": true,
+		"title": "Hearts of the Sunrise"
+	},
+	"requirements": [["diamond"]],
+	"sends_telemetry_event": false
+}

src/main/resources/data/minecraft/advancements/story/mine_stone.json

@@ -0,0 +1,39 @@
+{
+  "parent": "minecraft:story/root",
+  "criteria": {
+    "wooden_paxel": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "paxelsfordummies:wooden_paxel"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.story.wooden_paxel.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "paxelsfordummies:wooden_paxel",
+      "nbt": "{Damage:0}"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.story.wooden_paxel.title"
+    }
+  },
+  "requirements": [
+    [
+      "wooden_paxel"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/main/resources/data/minecraft/loot_tables/archaeology/ocean_ruin_cold.json

@@ -0,0 +1,75 @@
+{
+	"type": "minecraft:archaeology",
+	"pools": [
+		{
+			"bonus_rolls": 0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:blade_pottery_sherd"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:explorer_pottery_sherd"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:mourner_pottery_sherd"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:plenty_pottery_sherd"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:iron_axe"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:stone_axe",
+					"functions":[{
+						"function":"enchant_with_levels",
+						"treasure":true,
+						"levels":15
+					}]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:emerald",
+					"weight": 2
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:bowl",
+					"weight": 2
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:iron_pickaxe",
+					"weight": 1
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:stone_pickaxe",
+					"functions":[{
+						"function":"enchant_with_levels",
+						"treasure":true,
+						"levels":15
+					}]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:coal",
+					"weight": 2
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:iron_ingot",
+					"weight": 2
+				}
+			],
+			"rolls": 1
+		}
+	],
+	"random_sequence": "minecraft:archaeology/ocean_ruin_cold"
+}

src/main/resources/data/minecraft/loot_tables/archaeology/ocean_ruin_warm.json

@@ -0,0 +1,74 @@
+{
+	"type": "minecraft:archaeology",
+	"pools": [
+		{
+			"bonus_rolls": 0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:angler_pottery_sherd"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:shelter_pottery_sherd"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:snort_pottery_sherd"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:sniffer_egg"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:stone_sword",
+					"functions":[{
+							"function": "minecraft:enchant_with_levels",
+							"levels": 15,
+							"treasure": true
+					}]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:iron_sword"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:emerald",
+					"weight": 2
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:wheat",
+					"weight": 2
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:stone_shovel",
+					"functions":[{
+							"function": "minecraft:enchant_with_levels",
+							"levels": 15,
+							"treasure": true
+					}]
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:iron_shovel"
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:coal",
+					"weight": 2
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:iron_ingot",
+					"weight": 2
+				}
+			],
+			"rolls": 1
+		}
+	],
+	"random_sequence": "minecraft:archaeology/ocean_ruin_warm"
+}

src/main/resources/data/minecraft/loot_tables/chests/abandoned_mineshaft.json

@@ -0,0 +1,237 @@
+{
+	"type": "minecraft:chest",
+	"pools": [
+		{
+			"bonus_rolls": 0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:apple",
+					"weight": 20
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:name_tag",
+					"weight": 30
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"function": "minecraft:enchant_randomly"
+						}
+					],
+					"name": "minecraft:book",
+					"weight": 10
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:iron_pickaxe",
+					"weight": 5
+				},
+				{
+					"type": "minecraft:empty",
+					"weight": 5
+				}
+			],
+			"rolls": 1
+		},
+		{
+			"bonus_rolls": 0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 5,
+								"min": 1
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:iron_ingot",
+					"weight": 10
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 9,
+								"min": 4
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:amethyst_shard",
+					"weight": 2
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 9,
+								"min": 4
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:lapis_lazuli",
+					"weight": 5
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 2,
+								"min": 1
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:gold_ingot",
+					"weight": 3
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 13,
+								"min": 7
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:coal",
+					"weight": 10
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 7,
+								"min": 2
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:cooked_porkchop",
+					"weight": 15
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 4,
+								"min": 2
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:firework",
+					"weight": 4
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 2,
+								"min": 1
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:golden_apple",
+					"weight": 5
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:beetroot_soup",
+					"weight": 10
+				}
+			],
+			"rolls": {
+				"type": "minecraft:uniform",
+				"max": 4,
+				"min": 2
+			}
+		},
+		{
+			"bonus_rolls": 0,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 8,
+								"min": 4
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:iron_ingot",
+					"weight": 20
+				},
+				{
+					"type": "minecraft:item",
+					"functions": [
+						{
+							"add": false,
+							"count": {
+								"type": "minecraft:uniform",
+								"max": 8,
+								"min": 4
+							},
+							"function": "minecraft:set_count"
+						}
+					],
+					"name": "minecraft:gold_nugget",
+					"weight": 5
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:music_disc_chirp",
+					"weight": 5
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:music_disc_mellohi",
+					"weight": 5
+				},
+				{
+					"type": "minecraft:item",
+					"name": "minecraft:music_disc_13",
+					"weight": 7
+				}
+			],
+			"rolls": 3
+		}
+	],
+	"random_sequence": "minecraft:chests/abandoned_mineshaft"
+}

src/main/resources/data/minecraft/loot_tables/chests/ancient_city.json

@@ -0,0 +1,123 @@
+{
+	"pools":[{
+		"rolls": {"min":12,"max":17},
+		"entries":[
+			{
+				"type":"item",
+				"name":"minecraft:enchanted_golden_apple",
+				"weight":1
+			},
+			{
+				"type":"item",
+				"name":"minecraft:recovery_compass",
+				"weight":1
+			},
+
+			{
+				"type":"item",
+				"name":"minecraft:diamond_sword",
+				"functions":[{
+					"function":"enchant_with_levels",
+					"treasure":true,
+					"levels": {"min":25,"max":40}
+				}],
+				"weight":2
+			},
+			{
+				"type":"item",
+				"name":"minecraft:diamond_boots",
+				"functions":[{
+					"function":"enchant_with_levels",
+					"treasure":true,
+					"levels": {"min":25,"max":40}
+				}],
+				"weight":2
+			},
+			{
+				"type":"item",
+				"name":"minecraft:diamond_horse_armor",
+				"weight":2
+			},
+			{
+				"type":"item",
+				"name":"minecraft:music_disc_13",
+				"weight":1
+			},
+			{
+				"type":"item",
+				"name":"minecraft:music_disc_cat",
+				"weight":1
+			},
+			{
+				"type":"item",
+				"name":"minecraft:music_disc_otherside",
+				"weight":1
+			},
+
+			{
+				"type":"item",
+				"name":"minecraft:echo_shard",
+				"weight":4
+			},
+			{
+				"type":"item",
+				"name":"minecraft:disc_fragment_5",
+				"weight":5
+			},
+			{
+				"type":"item",
+				"name":"minecraft:experience_bottle",
+				"functions":[{
+					"function":"minecraft:set_count",
+					"count": {"type":"minecraft:uniform","min":17,"max":22}
+				}],
+				"weight":4
+			},
+			{
+				"type":"item",
+				"name":"minecraft:sculk",
+				"functions":[{
+					"function":"minecraft:set_count",
+					"count": {"type":"minecraft:uniform","min":10,"max":18}
+				}],
+				"weight":8
+			},
+			{
+				"type":"item",
+				"name":"minecraft:sculk_sensor",
+				"functions":[{
+					"function":"minecraft:set_count",
+					"count": {"type":"minecraft:uniform","min":1,"max":3}
+				}],
+				"weight":4
+			},
+			{
+				"type":"item",
+				"name":"minecraft:black_wool",
+				"functions":[{
+					"function":"minecraft:set_count",
+					"count": {"type":"minecraft:uniform","min":8,"max":15}
+				}],
+				"weight":6
+			},
+			{
+				"type":"item",
+				"name":"minecraft:deepslate_bricks",
+				"functions":[{
+					"function":"minecraft:set_count",
+					"count": {"type":"minecraft:uniform","min":8,"max":15}
+				}],
+				"weight":7
+			},
+			{
+				"type":"item",
+				"name":"minecraft:lingering_potion",
+				"functions":[{
+					"function":"minecraft:set_potion",
+					"id":"minecraft:long_swiftness"
+				}],
+				"weight":4
+			}
+		]
+	}]
+}