diff --git a/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java b/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java index cc8406b326d..0fd7ad18398 100644 --- a/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java +++ b/src/main/java/gregtech/api/worldgen/config/BedrockFluidDepositDefinition.java @@ -2,6 +2,7 @@ import com.google.gson.JsonObject; import gregtech.api.util.GTLog; +import gregtech.api.util.LocalizationUtils; import gregtech.api.worldgen.bedrockFluids.BedrockFluidVeinHandler; import net.minecraft.world.WorldProvider; import net.minecraft.world.biome.Biome; @@ -55,7 +56,7 @@ public boolean initializeFromConfig(@Nonnull JsonObject configRoot) { } // vein name for JEI display if (configRoot.has("name")) { - this.assignedName = configRoot.get("name").getAsString(); + this.assignedName = LocalizationUtils.format(configRoot.get("name").getAsString()); } // vein description for JEI display if (configRoot.has("description")) { diff --git a/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java b/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java index 73a65c0f86c..dd1da1463f2 100644 --- a/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java +++ b/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java @@ -2,6 +2,7 @@ import com.google.gson.JsonObject; import gregtech.api.unification.ore.StoneType; +import gregtech.api.util.LocalizationUtils; import gregtech.api.util.WorldBlockPredicate; import gregtech.api.worldgen.filler.BlockFiller; import gregtech.api.worldgen.populator.IVeinPopulator; @@ -46,7 +47,7 @@ public boolean initializeFromConfig(@Nonnull JsonObject configRoot) { this.weight = configRoot.get("weight").getAsInt(); this.density = configRoot.get("density").getAsFloat(); if (configRoot.has("name")) { - this.assignedName = configRoot.get("name").getAsString(); + this.assignedName = LocalizationUtils.format(configRoot.get("name").getAsString()); } if (configRoot.has("description")) { this.description = configRoot.get("description").getAsString(); diff --git a/src/main/java/gregtech/integration/jei/basic/GTOreCategory.java b/src/main/java/gregtech/integration/jei/basic/GTOreCategory.java index a6886245981..29e91bca4a5 100644 --- a/src/main/java/gregtech/integration/jei/basic/GTOreCategory.java +++ b/src/main/java/gregtech/integration/jei/basic/GTOreCategory.java @@ -13,6 +13,7 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import javax.annotation.Nonnull; @@ -107,18 +108,18 @@ public void drawExtras(@Nonnull Minecraft minecraft) { //Give room for 5 lines of 5 ores each, so 25 unique ores in the vein //73 is SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1 if (baseYPos >= SLOT_HEIGHT * NUM_OF_SLOTS) { - minecraft.fontRenderer.drawString("Spawn Range: " + minHeight + "-" + maxHeight, baseXPos, baseYPos + 1, 0x111111); + minecraft.fontRenderer.drawString(I18n.format("gregtech.jei.ore.spawn_range", minHeight, maxHeight), baseXPos, baseYPos + 1, 0x111111); } else { - minecraft.fontRenderer.drawString("Spawn Range: " + minHeight + "-" + maxHeight, baseXPos, SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1, 0x111111); + minecraft.fontRenderer.drawString(I18n.format("gregtech.jei.ore.spawn_range", minHeight, maxHeight), baseXPos, SLOT_HEIGHT * (NUM_OF_SLOTS - 1) + 1, 0x111111); //Update the position at which the spawn information ends baseYPos = 73; } //Create the Weight - minecraft.fontRenderer.drawString("Vein Weight: " + weight, baseXPos, baseYPos + FONT_HEIGHT, 0x111111); + minecraft.fontRenderer.drawString(I18n.format("gregtech.jei.ore.vein_weight", weight), baseXPos, baseYPos + FONT_HEIGHT, 0x111111); //Create the Dimensions - minecraft.fontRenderer.drawString("Dimensions: ", baseXPos, baseYPos + (2 * FONT_HEIGHT), 0x111111); + minecraft.fontRenderer.drawString(I18n.format("gregtech.jei.ore.dimension"), baseXPos, baseYPos + (2 * FONT_HEIGHT), 0x111111); JEIResourceDepositCategoryUtils.drawMultiLineCommaSeparatedDimensionList(WorldGenRegistry.getNamedDimensions(), dimension, @@ -128,6 +129,6 @@ public void drawExtras(@Nonnull Minecraft minecraft) { dimDisplayPos); //Label the Surface Identifier - minecraft.fontRenderer.drawSplitString("SurfaceMaterial", 15, 92, minecraft.fontRenderer.getStringWidth("Surface"), 0x111111); + minecraft.fontRenderer.drawSplitString(I18n.format("gregtech.jei.ore.surfacematerial"), 15, 92, baseXPos - 20, 0x111111); } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 8cad6220e51..b13bf0d78cf 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -5263,6 +5263,10 @@ gregtech.jei.ore.between_1=Between Ore gregtech.jei.ore.between_2=Spawns in the middle %d layers of the vein, with other ores gregtech.jei.ore.sporadic_1=Sporadic Ore gregtech.jei.ore.sporadic_2=Spawns anywhere in the vein +gregtech.jei.ore.spawn_range=Spawn Range: %d - %d +gregtech.jei.ore.vein_weight=Vein Weight: %d +gregtech.jei.ore.dimension=Dimensions: +gregtech.jei.ore.surfacematerial=Surface Material fluid.spawnlocation.name=Fluid Vein Information gregtech.jei.fluid.vein_weight=Vein Weight: %d @@ -5283,6 +5287,58 @@ gregtech.jei.materials.average_mass=Average mass: %,d gregtech.jei.materials.average_protons=Average protons: %,d gregtech.jei.materials.average_neutrons=Average neutrons: %,d +gregtech.veins.ore.bauxite=Bauxite Vein +gregtech.veins.ore.magnetite=Magnetite Vein +gregtech.veins.ore.naquadah=Naquadah Vein +gregtech.veins.ore.pitchblende=Pitchblende Vein +gregtech.veins.ore.scheelite=Scheelite Vein +gregtech.veins.ore.sheldonite=Sheldonite Vein +gregtech.veins.ore.banded_iron=Banded Iron Vein +gregtech.veins.ore.beryllium=Beryllium Vein +gregtech.veins.ore.certus_quartz=Certus Quartz Vein +gregtech.veins.ore.manganese=Manganese Vein +gregtech.veins.ore.molybdenum=Molybdenum Vein +gregtech.veins.ore.monazite=Monazite Vein +gregtech.veins.ore.nether_quartz=Nether Quartz Vein +gregtech.veins.ore.redstone=Redstone Vein +gregtech.veins.ore.saltpeter=Saltpeter Vein +gregtech.veins.ore.sulfur=Sulfur Vein +gregtech.veins.ore.tetrahedrite=Tetrahedrite Vein +gregtech.veins.ore.topaz=Topaz Vein +gregtech.veins.ore.apatite=Apatite Vein +gregtech.veins.ore.basalt_sphere=Basalt Sphere +gregtech.veins.ore.black_granite_sphere=Black Granite Sphere +gregtech.veins.ore.cassiterite=Cassiterite Vein +gregtech.veins.ore.coal=Coal Vein +gregtech.veins.ore.copper_tin=Copper Tin Vein +gregtech.veins.ore.copper=Copper Vein +gregtech.veins.ore.diamond=Diamond Vein +gregtech.veins.ore.galena=Galena Vein +gregtech.veins.ore.garnet_tin=Garnet Tin Vein +gregtech.veins.ore.garnet=Garnet Vein +gregtech.veins.ore.iron=Iron Vein +gregtech.veins.ore.lapis=Lapis Vein +gregtech.veins.ore.lubricant=Lubricant Vein +gregtech.veins.ore.marble_sphere=Marble Sphere +gregtech.veins.ore.mica=Mica Vein +gregtech.veins.ore.mineral_sand=Mineral Sand Vein +gregtech.veins.ore.nickel=Nickel Vein +gregtech.veins.ore.oilsands=Oilsands Vein +gregtech.veins.ore.olivine=Olivine Vein +gregtech.veins.ore.raw_oil_sphere=Raw Oil Sphere +gregtech.veins.ore.red_granite_sphere=Red Granite Sphere +gregtech.veins.ore.salts=Salts Vein +gregtech.veins.ore.sapphire=Sapphire Vein + +gregtech.veins.fluid.lava=Nether Lava Deposit +gregtech.veins.fluid.natural_gas_nether=Nether Natural Gas Deposit +gregtech.veins.fluid.heavy_oil=Overworld Heavy Oil Deposit +gregtech.veins.fluid.light_oil=Overworld Light Oil Deposit +gregtech.veins.fluid.natural_gas_overworld=Overworld Natural Gas Deposit +gregtech.veins.fluid.oil=Overworld Oil Deposit +gregtech.veins.fluid.raw_oil=Overworld Raw Oil Deposit +gregtech.veins.fluid.salt_water=Overworld Salt Water Deposit + gregtech.item_filter.empty_item=Empty (No Item) gregtech.item_filter.footer=§eClick with item to override diff --git a/src/main/resources/assets/gregtech/worldgen/fluid/nether/lava_deposit.json b/src/main/resources/assets/gregtech/worldgen/fluid/nether/lava_deposit.json index 39780f533ef..e6b2f878421 100644 --- a/src/main/resources/assets/gregtech/worldgen/fluid/nether/lava_deposit.json +++ b/src/main/resources/assets/gregtech/worldgen/fluid/nether/lava_deposit.json @@ -1,6 +1,6 @@ { + "name": "gregtech.veins.fluid.lava", "weight": 65, - "name": "Nether Lava Deposit", "yield": { "min": 125, "max": 250 diff --git a/src/main/resources/assets/gregtech/worldgen/fluid/nether/natural_gas_deposit.json b/src/main/resources/assets/gregtech/worldgen/fluid/nether/natural_gas_deposit.json index 2d8bacf3718..d9f5492f47f 100644 --- a/src/main/resources/assets/gregtech/worldgen/fluid/nether/natural_gas_deposit.json +++ b/src/main/resources/assets/gregtech/worldgen/fluid/nether/natural_gas_deposit.json @@ -1,6 +1,6 @@ { + "name": "gregtech.veins.fluid.natural_gas_nether", "weight": 35, - "name": "Nether Natural Gas Deposit", "yield": { "min": 150, "max": 300 diff --git a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/heavy_oil_deposit.json b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/heavy_oil_deposit.json index b1d6db85e0a..c1d61988189 100644 --- a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/heavy_oil_deposit.json +++ b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/heavy_oil_deposit.json @@ -1,6 +1,6 @@ { + "name": "gregtech.veins.fluid.heavy_oil", "weight": 15, - "name": "Heavy Oil Deposit", "yield": { "min": 100, "max": 200 diff --git a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/light_oil_deposit.json b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/light_oil_deposit.json index 8fec02e3ea9..d0bd6887f4a 100644 --- a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/light_oil_deposit.json +++ b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/light_oil_deposit.json @@ -1,6 +1,6 @@ { + "name": "gregtech.veins.fluid.light_oil", "weight": 25, - "name": "Overworld Light Oil Deposit", "yield": { "min": 175, "max": 300 diff --git a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/natural_gas_deposit.json b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/natural_gas_deposit.json index 7e1300d6c24..1978081beb8 100644 --- a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/natural_gas_deposit.json +++ b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/natural_gas_deposit.json @@ -1,6 +1,6 @@ { + "name": "gregtech.veins.fluid.natural_gas_overworld", "weight": 15, - "name": "Overworld Natural Gas Deposit", "yield": { "min": 100, "max": 175 diff --git a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/oil_deposit.json b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/oil_deposit.json index 2710ebd5eb3..a03803b015f 100644 --- a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/oil_deposit.json +++ b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/oil_deposit.json @@ -1,6 +1,6 @@ { + "name": "gregtech.veins.fluid.oil", "weight": 20, - "name": "Overworld Oil Deposit", "yield": { "min": 175, "max": 300 diff --git a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/raw_oil_deposit.json b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/raw_oil_deposit.json index 95d158fe57b..988dcdafcc1 100644 --- a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/raw_oil_deposit.json +++ b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/raw_oil_deposit.json @@ -1,6 +1,6 @@ { + "name": "gregtech.veins.fluid.raw_oil", "weight": 20, - "name": "Overworld Raw Oil Deposit", "yield": { "min": 200, "max": 300 diff --git a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/salt_water_deposit.json b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/salt_water_deposit.json index 1f4e13bffc6..a43334e6e91 100644 --- a/src/main/resources/assets/gregtech/worldgen/fluid/overworld/salt_water_deposit.json +++ b/src/main/resources/assets/gregtech/worldgen/fluid/overworld/salt_water_deposit.json @@ -1,6 +1,6 @@ { + "name": "gregtech.veins.fluid.salt_water", "weight": 0, - "name": "Overworld Salt Water Deposit", "yield": { "min": 50, "max": 100 diff --git a/src/main/resources/assets/gregtech/worldgen/vein/end/bauxite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/end/bauxite_vein.json index 222fd9948ec..e546044a1ee 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/end/bauxite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/end/bauxite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.bauxite", "weight": 40, "density": 0.25, "min_height": 10, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/end/magnetite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/end/magnetite_vein.json index 3e4262b37d6..6c6fa266c5f 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/end/magnetite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/end/magnetite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.magnetite", "weight": 30, "density": 0.15, "min_height": 20, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/end/naquadah_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/end/naquadah_vein.json index 4b691fd659a..d223a5e7651 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/end/naquadah_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/end/naquadah_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.naquadah", "weight": 30, "density": 0.15, "min_height": 10, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/end/pitchblende_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/end/pitchblende_vein.json index db89ae8d891..2ff5ce03c9e 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/end/pitchblende_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/end/pitchblende_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.pitchblende", "weight": 20, "density": 0.25, "min_height": 30, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/end/scheelite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/end/scheelite_vein.json index 23057c0635b..0d0df8305c8 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/end/scheelite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/end/scheelite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.scheelite", "weight": 20, "density": 0.2, "min_height": 20, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/end/sheldonite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/end/sheldonite_vein.json index 8422870374c..c3e997e2a86 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/end/sheldonite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/end/sheldonite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.sheldonite", "weight": 10, "density": 0.2, "min_height": 5, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/banded_iron_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/banded_iron_vein.json index 38846a2a8e0..52dfd903371 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/banded_iron_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/banded_iron_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.banded_iron", "weight": 30, "density": 0.2, "min_height": 20, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/beryllium_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/beryllium_vein.json index 3bca7c10715..c7e33ba30bc 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/beryllium_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/beryllium_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.beryllium", "weight": 30, "density": 0.25, "min_height": 5, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/certus_quartz_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/certus_quartz_vein.json index b7f0e05f30a..f7f3180b638 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/certus_quartz_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/certus_quartz_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.certus_quartz", "weight": 40, "density": 0.25, "min_height": 80, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/manganese_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/manganese_vein.json index 385d6b261b2..a5caeb7b268 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/manganese_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/manganese_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.manganese", "weight": 20, "density": 0.25, "min_height": 20, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/molybdenum_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/molybdenum_vein.json index 2dc54953b67..98da79a1323 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/molybdenum_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/molybdenum_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.molybdenum", "weight": 5, "density": 0.25, "min_height": 20, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/monazite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/monazite_vein.json index 75c9048102f..bbaaf51d95d 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/monazite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/monazite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.monazite", "weight": 30, "density": 0.25, "min_height": 20, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/nether_quartz_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/nether_quartz_vein.json index 7f77f1328f7..2e5398cfb5c 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/nether_quartz_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/nether_quartz_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.nether_quartz", "weight": 80, "density": 0.2, "min_height": 40, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/redstone_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/redstone_vein.json index ae498f274e5..ed709bc09f8 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/redstone_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/redstone_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.redstone", "weight": 60, "density": 0.2, "min_height": 5, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/saltpeter_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/saltpeter_vein.json index f77e4cb8606..09c7595d993 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/saltpeter_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/saltpeter_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.saltpeter", "weight": 40, "density": 0.25, "min_height": 5, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/sulfur_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/sulfur_vein.json index 90069af5e61..b826b2afb44 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/sulfur_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/sulfur_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.sulfur", "weight": 100, "density": 0.2, "min_height": 10, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/tetrahedrite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/tetrahedrite_vein.json index cc42f7b16c4..3681c3aa925 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/tetrahedrite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/tetrahedrite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.tetrahedrite", "weight": 70, "density": 0.2, "min_height": 80, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/nether/topaz_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/nether/topaz_vein.json index 90c711c2ff9..fe5b98908cd 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/nether/topaz_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/nether/topaz_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.topaz", "weight": 40, "density": 0.25, "min_height": 80, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/apatite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/apatite_vein.json index 39089811595..8aee4e1107f 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/apatite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/apatite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.apatite", "weight": 40, "density": 0.25, "max_height": 60, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/basalt_sphere.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/basalt_sphere.json index dd62641f41c..949100da568 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/basalt_sphere.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/basalt_sphere.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.basalt_sphere", "weight": 120, "priority": 100, "density": 1.0, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/black_granite_sphere.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/black_granite_sphere.json index 36f98f09e1f..b4cb48ca3f7 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/black_granite_sphere.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/black_granite_sphere.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.black_granite_sphere", "weight": 90, "priority": 100, "density": 1.0, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/cassiterite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/cassiterite_vein.json index 45ce342e746..33c9a9545e5 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/cassiterite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/cassiterite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.cassiterite", "weight": 80, "density": 0.2, "max_height": 60, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/coal_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/coal_vein.json index e7987a259d6..5917e94b322 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/coal_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/coal_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.coal", "weight": 80, "density": 0.25, "max_height": 80, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/copper_tin_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/copper_tin_vein.json index 333c1f51554..7881d2d74e9 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/copper_tin_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/copper_tin_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.copper_tin", "weight": 50, "density": 0.2, "max_height": 160, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/copper_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/copper_vein.json index 9b13c002a5e..0eabab9b2ca 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/copper_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/copper_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.copper", "weight": 80, "density": 0.2, "max_height": 60, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/diamond_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/diamond_vein.json index b195a1bb75f..496d850c26a 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/diamond_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/diamond_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.diamond", "weight": 40, "density": 0.25, "max_height": 20, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/galena_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/galena_vein.json index ea873ed15dc..5d4620a3d35 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/galena_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/galena_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.galena", "weight": 40, "density": 0.25, "max_height": 45, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/garnet_tin_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/garnet_tin_vein.json index 6d961cc0d0c..b76486a2b5d 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/garnet_tin_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/garnet_tin_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.garnet_tin", "weight": 80, "density": 0.2, "max_height": 60, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/garnet_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/garnet_vein.json index 6a4ba970a1c..855f0539438 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/garnet_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/garnet_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.garnet", "weight": 40, "density": 0.25, "max_height": 30, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/iron_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/iron_vein.json index 0cff56a9626..17e6ebab368 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/iron_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/iron_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.iron", "weight": 120, "density": 0.2, "max_height": 40, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/lapis_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/lapis_vein.json index 4374b9a7293..eb1b2e73e91 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/lapis_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/lapis_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.lapis", "weight": 40, "density": 0.25, "max_height": 50, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/lubricant_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/lubricant_vein.json index aa6ddbec127..2bd77fd41ba 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/lubricant_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/lubricant_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.lubricant", "weight": 40, "density": 0.25, "max_height": 50, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/magnetite_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/magnetite_vein.json index 490aad0104a..eaa0fc32c0c 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/magnetite_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/magnetite_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.magnetite", "weight": 80, "density": 0.15, "max_height": 60, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/manganese_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/manganese_vein.json index fa197838d2b..2f24f9868d7 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/manganese_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/manganese_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.manganese", "weight": 20, "density": 0.25, "max_height": 30, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/marble_sphere.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/marble_sphere.json index 86b5116e6b8..59fa73a4404 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/marble_sphere.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/marble_sphere.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.marble_sphere", "weight": 120, "priority": 100, "density": 1.0, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/mica_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/mica_vein.json index a9a3c551c9c..b7d2d219fcc 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/mica_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/mica_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.mica", "weight": 20, "density": 0.25, "max_height": 40, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/mineral_sand_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/mineral_sand_vein.json index 271b4d50f64..e57be57bc5e 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/mineral_sand_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/mineral_sand_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.mineral_sand", "weight": 80, "density": 0.2, "max_height": 60, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/nickel_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/nickel_vein.json index 15f921edf9e..3b5f4ffe5c0 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/nickel_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/nickel_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.nickel", "weight": 40, "density": 0.25, "max_height": 40, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/oilsands_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/oilsands_vein.json index 3a7d0a52629..7746504d851 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/oilsands_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/oilsands_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.oilsands", "weight": 40, "density": 0.3, "max_height": 80, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/olivine_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/olivine_vein.json index 6ea20f2491f..21ed6730d45 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/olivine_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/olivine_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.olivine", "weight": 20, "density": 0.25, "max_height": 40, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/raw_oil_sphere.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/raw_oil_sphere.json index a15eceab353..6f76153989f 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/raw_oil_sphere.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/raw_oil_sphere.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.raw_oil_sphere", "weight": 50, "density": 1.0, "max_height": 40, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/red_granite_sphere.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/red_granite_sphere.json index be8a1e00209..1d4c6d61c96 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/red_granite_sphere.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/red_granite_sphere.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.red_granite_sphere", "weight": 90, "priority": 100, "density": 1.0, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/redstone_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/redstone_vein.json index dea251bb594..f3b311bf6e6 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/redstone_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/redstone_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.redstone", "weight": 60, "density": 0.2, "max_height": 40, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/salts_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/salts_vein.json index 2173ffb1863..94787d1016e 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/salts_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/salts_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.salts", "weight": 50, "density": 0.2, "max_height": 70, diff --git a/src/main/resources/assets/gregtech/worldgen/vein/overworld/sapphire_vein.json b/src/main/resources/assets/gregtech/worldgen/vein/overworld/sapphire_vein.json index 8c75e576f6c..29ff592feaa 100644 --- a/src/main/resources/assets/gregtech/worldgen/vein/overworld/sapphire_vein.json +++ b/src/main/resources/assets/gregtech/worldgen/vein/overworld/sapphire_vein.json @@ -1,4 +1,5 @@ { + "name": "gregtech.veins.ore.sapphire", "weight": 60, "density": 0.25, "max_height": 40,