diff --git a/modrinth.index.json b/modrinth.index.json index d9cc773..ff7dcf7 100644 --- a/modrinth.index.json +++ b/modrinth.index.json @@ -97,6 +97,21 @@ "sha512": "872c2c6562b76fd1b1876871845cf3480bdc47f33305f28144876c0d50a6441f057c9f9bf450385ac64e92d916e918d167d7ca439386f6bd06c27062ba0b2f1d" }, "path": "mods/treesmakesound-1.2.1.jar" + }, + { + "downloads": [ + "https://cdn.modrinth.com/data/3rOtjaMW/versions/RnpX7Wfv/fixedminecraft-1.6.1-1.21.1.jar" + ], + "env": { + "client": "required", + "server": "required" + }, + "fileSize": 7115800, + "hashes": { + "sha1": "1038c7e8c80a6b8d49076a80c5ba7d3b254189c3", + "sha512": "85669d670c218eedb3f3f503904a038b5b678d7ba6081c00ac9f9100d4e4f185402f3252c03387fc9519b24a1389c317f465a9ed15a92a1cc46cb51b8bfb6e2b" + }, + "path": "mods/fixedminecraft-1.6.1-1.21.1.jar" } ] } diff --git a/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/background.png b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/background.png new file mode 100644 index 0000000..c8cb5e8 Binary files /dev/null and b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/background.png differ diff --git a/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/buttons.png b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/buttons.png new file mode 100644 index 0000000..4b0a72b Binary files /dev/null and b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/buttons.png differ diff --git a/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/config.png b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/config.png new file mode 100644 index 0000000..b293ee1 Binary files /dev/null and b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/config.png differ diff --git a/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/pieces.png b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/pieces.png new file mode 100644 index 0000000..54b3fc6 Binary files /dev/null and b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/pieces.png differ diff --git a/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/widgets.png b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/widgets.png new file mode 100644 index 0000000..c47975f Binary files /dev/null and b/overrides/global_packs/mc_rebalance_datapack/assets/emi/textures/gui/widgets.png differ diff --git a/overrides/global_packs/mc_rebalance_datapack/assets/fixedminecraft/lang/en_gb.json b/overrides/global_packs/mc_rebalance_datapack/assets/fixedminecraft/lang/en_gb.json new file mode 100644 index 0000000..6987db0 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/assets/fixedminecraft/lang/en_gb.json @@ -0,0 +1,7 @@ +{ + "item.fixedminecraft.netherite_horse_armor": "Dendrite Horse Armour", + "block.fixedminecraft.netherite_anvil": "Dendrite Anvil", + "block.fixedminecraft.chipped_netherite_anvil": "Chipped Dendrite Anvil", + "block.fixedminecraft.damaged_netherite_anvil": "Damaged Dendrite Anvil", + "advancements.nether.repair_super_gear.description": "Repair Super Enchanted Gear within a Dendrite Anvil" +} diff --git a/overrides/global_packs/mc_rebalance_datapack/assets/fixedminecraft/lang/en_us.json b/overrides/global_packs/mc_rebalance_datapack/assets/fixedminecraft/lang/en_us.json new file mode 100644 index 0000000..bef1f1c --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/assets/fixedminecraft/lang/en_us.json @@ -0,0 +1,7 @@ +{ + "item.fixedminecraft.netherite_horse_armor": "Dendrite Horse Armor", + "block.fixedminecraft.netherite_anvil": "Dendrite Anvil", + "block.fixedminecraft.chipped_netherite_anvil": "Chipped Dendrite Anvil", + "block.fixedminecraft.damaged_netherite_anvil": "Damaged Dendrite Anvil", + "advancements.nether.repair_super_gear.description": "Repair Super Enchanted Gear within a Dendrite Anvil" +} diff --git a/overrides/global_packs/mc_rebalance_datapack/assets/minecraft/shaders/core/rendertype_text.fsh b/overrides/global_packs/mc_rebalance_datapack/assets/minecraft/shaders/core/rendertype_text.fsh new file mode 100644 index 0000000..a7adddb --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/assets/minecraft/shaders/core/rendertype_text.fsh @@ -0,0 +1,33 @@ +#version 150 + +#moj_import + +uniform sampler2D Sampler0; + +uniform vec4 ColorModulator; +uniform float FogStart; +uniform float FogEnd; +uniform vec4 FogColor; + +in float vertexDistance; +in vec4 vertexColor; +in vec2 texCoord0; + +out vec4 fragColor; + +void main() { + vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; + if (color.a < 0.1) { + discard; + } + + if((color.r < 66/255.0 && color.r > 63/255.0) && (color.g < 66/255.0 && color.g > 63/255.0) && (color.b < 66/255.0 && color.b > 63/255.0)){ + color = vec4(0.6588, 0.6588, 0.6588, color.a); + } + + if(color.r < 42/255.0 && color.r > 40/255.0 && color.g < 42/255.0 && color.g > 40/255.0 && color.b < 42/255.0 && color.b > 40/255.0){ + color = vec4(0.1059, 0.1059, 0.1059, color.a); + } + + fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/item_components/stack_size/16.json b/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/item_components/stack_size/16.json new file mode 100644 index 0000000..8f6ae7b --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/item_components/stack_size/16.json @@ -0,0 +1,9 @@ +{ + "targets": [ + "fixedminecraft:chainmail_horse_armor", + "fixedminecraft:netherite_horse_armor" + ], + "components": { + "minecraft:max_stack_size": 16 + } +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/recipe/netherite_anvil_smithing.json b/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/recipe/netherite_anvil_smithing.json new file mode 100644 index 0000000..f004b86 --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/recipe/netherite_anvil_smithing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_block" + }, + "base": { + "item": "minecraft:anvil" + }, + "result": { + "count": 1, + "id": "fixedminecraft:netherite_anvil" + }, + "template": [] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/recipe/netherite_horse_armor_smithing.json b/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/recipe/netherite_horse_armor_smithing.json new file mode 100644 index 0000000..8933dab --- /dev/null +++ b/overrides/global_packs/mc_rebalance_datapack/data/fixedminecraft/recipe/netherite_horse_armor_smithing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "minecraft:diamond_horse_armor" + }, + "result": { + "count": 1, + "id": "fixedminecraft:netherite_horse_armor" + }, + "template": [] +} diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/boots.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/boots.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/boots.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/boots.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/chestplate.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/chestplate.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/chestplate.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/chestplate.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/helmet.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/helmet.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/helmet.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/helmet.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/leggings.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/leggings.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/leggings.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/leggings.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/axe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/axe.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/axe.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/axe.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/durability.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/durability.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/durability.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/durability.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/hoe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/hoe.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/hoe.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/hoe.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/pickaxe.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/pickaxe.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/pickaxe.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/pickaxe.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/shovel.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/shovel.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/shovel.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/shovel.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/sword.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/sword.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/gold/tools/sword.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/gold/tools/sword.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/16.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/16.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/16.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/16.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/64.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/64.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/64.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/64.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/banner.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/banner.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/banner.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/banner.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/bed.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/bed.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/bed.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/bed.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/boat.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/boat.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/boat.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/boat.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/sign.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/sign.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/sign.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/sign.json diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/soup.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/soup.json similarity index 100% rename from overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/item_components/stack_size/soup.json rename to overrides/global_packs/mc_rebalance_datapack/data/minecraft/item_components/stack_size/soup.json