diff --git a/src/main/generated/assets/galacticraft/lang/en_us.json b/src/main/generated/assets/galacticraft/lang/en_us.json index 01b850a9c..4211f9154 100644 --- a/src/main/generated/assets/galacticraft/lang/en_us.json +++ b/src/main/generated/assets/galacticraft/lang/en_us.json @@ -32,15 +32,15 @@ "block.galacticraft.asteroid_rock_block_2": "Asteroid Rock", "block.galacticraft.basic_solar_panel": "Basic Solar Panel", "block.galacticraft.basic_solar_panel.description": "Basic Solar Panels collect energy from the sun, and store it for further use. Collects most energy at mid-day (non-adjustable).", - "block.galacticraft.black_candle_moon_cheese_wheel": "Block of Cheese with Black Candle", - "block.galacticraft.blue_candle_moon_cheese_wheel": "Block of Cheese with Blue Candle", + "block.galacticraft.black_candle_moon_cheese_wheel": "Moon Cheese Wheel with Black Candle", + "block.galacticraft.blue_candle_moon_cheese_wheel": "Moon Cheese Wheel with Blue Candle", "block.galacticraft.boss_spawner": "Boss Spawner", "block.galacticraft.bronze_decoration": "Bronze Decoration", "block.galacticraft.bronze_decoration_slab": "Bronze Decoration Slab", "block.galacticraft.bronze_decoration_stairs": "Bronze Decoration Stairs", "block.galacticraft.bronze_decoration_wall": "Bronze Decoration Wall", - "block.galacticraft.brown_candle_moon_cheese_wheel": "Block of Cheese with Brown Candle", - "block.galacticraft.candle_moon_cheese_wheel": "Block of Cheese with Candle", + "block.galacticraft.brown_candle_moon_cheese_wheel": "Moon Cheese Wheel with Brown Candle", + "block.galacticraft.candle_moon_cheese_wheel": "Moon Cheese Wheel with Candle", "block.galacticraft.cavernous_vines": "Cavernous Vines", "block.galacticraft.cavernous_vines_plant": "Cavernous Vines Plant", "block.galacticraft.chiseled_moon_rock_brick": "Chiseled Moon Rock Brick", @@ -73,7 +73,7 @@ "block.galacticraft.crude_oil": "Crude Oil", "block.galacticraft.cryogenic_chamber": "Cryogenic Chamber", "block.galacticraft.cryogenic_chamber_part": "Cryogenic Chamber Part", - "block.galacticraft.cyan_candle_moon_cheese_wheel": "Block of Cheese with Cyan Candle", + "block.galacticraft.cyan_candle_moon_cheese_wheel": "Moon Cheese Wheel with Cyan Candle", "block.galacticraft.dark_decoration": "Dark Decoration", "block.galacticraft.dark_decoration_slab": "Dark Decoration Slab", "block.galacticraft.dark_decoration_stairs": "Dark Decoration Stairs", @@ -137,8 +137,8 @@ "block.galacticraft.glowstone_lantern": "Glowstone Lantern", "block.galacticraft.glowstone_torch": "Glowstone Torch", "block.galacticraft.iron_grating": "Iron Grating", - "block.galacticraft.gray_candle_moon_cheese_wheel": "Block of Cheese with Gray Candle", - "block.galacticraft.green_candle_moon_cheese_wheel": "Block of Cheese with Green Candle", + "block.galacticraft.gray_candle_moon_cheese_wheel": "Moon Cheese Wheel with Gray Candle", + "block.galacticraft.green_candle_moon_cheese_wheel": "Moon Cheese Wheel with Green Candle", "block.galacticraft.hard_venus_rock": "Hard Venus Rock", "block.galacticraft.heavy_sealable_aluminum_wire": "Heavy Sealable Aluminum Wire", "block.galacticraft.ilmenite_ore": "Ilmenite Ore", @@ -147,9 +147,9 @@ "block.galacticraft.iron_decoration_stairs": "Iron Decoration Stairs", "block.galacticraft.iron_decoration_wall": "Iron Decoration Wall", "block.galacticraft.lead_block": "Block of Lead", - "block.galacticraft.light_blue_candle_moon_cheese_wheel": "Block of Cheese with Light Blue Candle", - "block.galacticraft.light_gray_candle_moon_cheese_wheel": "Block of Cheese with Light Gray Candle", - "block.galacticraft.lime_candle_moon_cheese_wheel": "Block of Cheese with Lime Candle", + "block.galacticraft.light_blue_candle_moon_cheese_wheel": "Moon Cheese Wheel with Light Blue Candle", + "block.galacticraft.light_gray_candle_moon_cheese_wheel": "Moon Cheese Wheel with Light Gray Candle", + "block.galacticraft.lime_candle_moon_cheese_wheel": "Moon Cheese Wheel with Lime Candle", "block.galacticraft.linear_light_panel": "Light Panel (Linear)", "block.galacticraft.lunar_cartography_table": "Lunar Cartography Table", "block.galacticraft.lunar_sapphire_block": "Block of Lunar Sapphire", @@ -159,7 +159,7 @@ "block.galacticraft.lunaslate_stairs": "Lunaslate Stairs", "block.galacticraft.lunaslate_tin_ore": "Lunaslate Tin Ore", "block.galacticraft.lunaslate_wall": "Lunaslate Wall", - "block.galacticraft.magenta_candle_moon_cheese_wheel": "Block of Cheese with Magenta Candle", + "block.galacticraft.magenta_candle_moon_cheese_wheel": "Moon Cheese Wheel with Magenta Candle", "block.galacticraft.mars_cobblestone": "Mars Cobblestone", "block.galacticraft.mars_cobblestone_slab": "Mars Cobblestone Slab", "block.galacticraft.mars_cobblestone_stairs": "Mars Cobblestone Stairs", @@ -184,7 +184,7 @@ "block.galacticraft.moon_basalt_stairs": "Moon Basalt Stairs", "block.galacticraft.moon_basalt_wall": "Moon Basalt Wall", "block.galacticraft.moon_cheese_wheel": "Moon Cheese Wheel", - "block.galacticraft.moon_cheese_wheel.description": "Cheese Blocks are created from the cheeses of the Moon, place-able and edible.", + "block.galacticraft.moon_cheese_wheel.description": "Moon Cheese Wheels are created from the cheeses of the Moon, place-able and edible.", "block.galacticraft.moon_copper_ore": "Moon Copper Ore", "block.galacticraft.moon_dirt": "Moon Dirt", "block.galacticraft.moon_dirt_path": "Moon Dirt Path", @@ -204,7 +204,7 @@ "block.galacticraft.olivine_basalt": "Olivine Basalt", "block.galacticraft.olivine_block": "Block of Olivine", "block.galacticraft.olivine_cluster": "Olivine Cluster", - "block.galacticraft.orange_candle_moon_cheese_wheel": "Block of Cheese with Orange Candle", + "block.galacticraft.orange_candle_moon_cheese_wheel": "Moon Cheese Wheel with Orange Candle", "block.galacticraft.oxygen_bubble_distributor": "Bubble Distributor", "block.galacticraft.oxygen_bubble_distributor.description": "Oxygen Bubble Distributor creates a bubble of air around itself. Requires oxygen and electricity.", "block.galacticraft.oxygen_collector": "Oxygen Collector", @@ -215,21 +215,21 @@ "block.galacticraft.oxygen_storage_module": "Oxygen Storage Module", "block.galacticraft.parachest": "Parachest", "block.galacticraft.parachest.description": "Parachests will fall from the sky after landing on certain planets/moons, such as Earth. Contains rocket, fuel, and cargo from previous launch.", - "block.galacticraft.pink_candle_moon_cheese_wheel": "Block of Cheese with Pink Candle", + "block.galacticraft.pink_candle_moon_cheese_wheel": "Moon Cheese Wheel with Pink Candle", "block.galacticraft.player_transport_tube": "Player Transport Tube", "block.galacticraft.polished_moon_rock": "Polished Moon Rock", "block.galacticraft.polished_moon_rock_slab": "Polished Moon Rock Slab", "block.galacticraft.polished_moon_rock_stairs": "Polished Moon Rock Stairs", "block.galacticraft.polished_moon_rock_wall": "Polished Moon Rock Wall", "block.galacticraft.pumice": "Pumice", - "block.galacticraft.purple_candle_moon_cheese_wheel": "Block of Cheese with Purple Candle", - "block.galacticraft.red_candle_moon_cheese_wheel": "Block of Cheese with Red Candle", + "block.galacticraft.purple_candle_moon_cheese_wheel": "Moon Cheese Wheel with Purple Candle", + "block.galacticraft.red_candle_moon_cheese_wheel": "Moon Cheese Wheel with Red Candle", "block.galacticraft.refinery": "Refinery", "block.galacticraft.refinery.description": "Refinery will take an input of oil and energy, and output fuel used for rockets and vehicles.", "block.galacticraft.rich_olivine_basalt": "Rich Olivine Basalt", "block.galacticraft.rocket_launch_pad": "Rocket Launch Pad", "block.galacticraft.rocket_workbench": "Rocket Workbench", - "block.galacticraft.scorched_venus_rock": "Scorched Rock", + "block.galacticraft.scorched_venus_rock": "Scorched Venus Rock", "block.galacticraft.sealable_aluminum_wire": "Sealable Aluminum Wire", "block.galacticraft.silicon_block": "Block of Silicon", "block.galacticraft.silicon_ore": "Silicon Ore", @@ -262,9 +262,9 @@ "block.galacticraft.vapor_spout": "Vapor Spout", "block.galacticraft.volcanic_rock": "Volcanic Rock", "block.galacticraft.walkway": "Walkway", - "block.galacticraft.white_candle_moon_cheese_wheel": "Block of Cheese with White Candle", + "block.galacticraft.white_candle_moon_cheese_wheel": "Moon Cheese Wheel with White Candle", "block.galacticraft.wire_walkway": "Wire Walkway", - "block.galacticraft.yellow_candle_moon_cheese_wheel": "Block of Cheese with Yellow Candle", + "block.galacticraft.yellow_candle_moon_cheese_wheel": "Moon Cheese Wheel with Yellow Candle", "category.recipe_viewer.circuit_fabricator": "Circuit Fabricating", "category.recipe_viewer.compressing": "Compressing", "chat.galacticraft.bed_fail": "Uh oh, what if the oxygen runs out when I am asleep? I'll need a Cryogenic Chamber to sleep in space!", @@ -434,7 +434,6 @@ "item.galacticraft.hot_throwable_meteor_chunk": "Hot Throwable Meteor Chunk", "item.galacticraft.infinite_battery": "Infinite Battery", "item.galacticraft.infinite_oxygen_tank": "Infinite Oxygen Tank", - "item.galacticraft.iron_shard": "Iron Shard", "item.galacticraft.isothermal_fabric": "Isothermal Fabric", "item.galacticraft.large_oxygen_tank": "Large Oxygen Tank", "item.galacticraft.lead_ingot": "Lead Ingot", diff --git a/src/main/generated/assets/galacticraft/models/item/aluminum_wire.json b/src/main/generated/assets/galacticraft/models/item/aluminum_wire.json deleted file mode 100644 index 51782c42c..000000000 --- a/src/main/generated/assets/galacticraft/models/item/aluminum_wire.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "galacticraft:block/aluminum_wire_inventory" -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/item/glass_fluid_pipe.json b/src/main/generated/assets/galacticraft/models/item/glass_fluid_pipe.json deleted file mode 100644 index c81f22488..000000000 --- a/src/main/generated/assets/galacticraft/models/item/glass_fluid_pipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "galacticraft:block/glass_fluid_pipe_inventory" -} \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/models/item/iron_shard.json b/src/main/generated/assets/galacticraft/models/item/iron_shard.json deleted file mode 100644 index 85d547e78..000000000 --- a/src/main/generated/assets/galacticraft/models/item/iron_shard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "galacticraft:item/iron_shard" - } -} \ No newline at end of file diff --git a/src/main/generated/data/galacticraft/advancement/recipes/misc/iron_ingot_from_blasting_iron_shard.json b/src/main/generated/data/galacticraft/advancement/recipes/misc/iron_ingot_from_blasting_iron_shard.json deleted file mode 100644 index f1eec292f..000000000 --- a/src/main/generated/data/galacticraft/advancement/recipes/misc/iron_ingot_from_blasting_iron_shard.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_iron_shard": { - "conditions": { - "items": [ - { - "items": "galacticraft:iron_shard" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:iron_ingot_from_blasting_iron_shard" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_iron_shard" - ] - ], - "rewards": { - "recipes": [ - "minecraft:iron_ingot_from_blasting_iron_shard" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/galacticraft/advancement/recipes/misc/iron_ingot_from_smelting_iron_shard.json b/src/main/generated/data/galacticraft/advancement/recipes/misc/iron_ingot_from_smelting_iron_shard.json deleted file mode 100644 index 82944d893..000000000 --- a/src/main/generated/data/galacticraft/advancement/recipes/misc/iron_ingot_from_smelting_iron_shard.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_iron_shard": { - "conditions": { - "items": [ - { - "items": "galacticraft:iron_shard" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:iron_ingot_from_smelting_iron_shard" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_iron_shard" - ] - ], - "rewards": { - "recipes": [ - "minecraft:iron_ingot_from_smelting_iron_shard" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/galacticraft/recipe/iron_ingot_from_blasting_iron_shard.json b/src/main/generated/data/galacticraft/recipe/iron_ingot_from_blasting_iron_shard.json deleted file mode 100644 index ad172836a..000000000 --- a/src/main/generated/data/galacticraft/recipe/iron_ingot_from_blasting_iron_shard.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:blasting", - "category": "misc", - "cookingtime": 100, - "experience": 0.7, - "group": "iron_ingot", - "ingredient": { - "item": "galacticraft:iron_shard" - }, - "result": { - "id": "minecraft:iron_ingot" - } -} \ No newline at end of file diff --git a/src/main/generated/data/galacticraft/recipe/iron_ingot_from_smelting_iron_shard.json b/src/main/generated/data/galacticraft/recipe/iron_ingot_from_smelting_iron_shard.json deleted file mode 100644 index 0e8ca1297..000000000 --- a/src/main/generated/data/galacticraft/recipe/iron_ingot_from_smelting_iron_shard.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "misc", - "cookingtime": 200, - "experience": 0.7, - "group": "iron_ingot", - "ingredient": { - "item": "galacticraft:iron_shard" - }, - "result": { - "id": "minecraft:iron_ingot" - } -} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json b/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json index 956a59e9c..e007f0515 100644 --- a/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json +++ b/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json @@ -1,6 +1,10 @@ { "values": [ "galacticraft:desh_ore", - "galacticraft:ilmenite_ore" + "galacticraft:raw_desh_block", + "galacticraft:desh_block", + "galacticraft:ilmenite_ore", + "galacticraft:raw_titanium_block", + "galacticraft:titanium_block" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json b/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json index ff9cfa24c..0dfeb581c 100644 --- a/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json @@ -2,6 +2,7 @@ "values": [ "galacticraft:silicon_ore", "galacticraft:deepslate_silicon_ore", + "galacticraft:silicon_block", "galacticraft:fallen_meteor" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json b/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json index 3b51f2dfd..90b3eeac7 100644 --- a/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json +++ b/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json @@ -10,8 +10,16 @@ "galacticraft:deepslate_tin_ore", "galacticraft:moon_tin_ore", "galacticraft:lunaslate_tin_ore", + "galacticraft:raw_tin_block", + "galacticraft:tin_block", "galacticraft:aluminum_ore", "galacticraft:deepslate_aluminum_ore", - "galacticraft:galena_ore" + "galacticraft:raw_aluminum_block", + "galacticraft:aluminum_block", + "galacticraft:galena_ore", + "galacticraft:raw_lead_block", + "galacticraft:lead_block", + "galacticraft:raw_meteoric_iron_block", + "galacticraft:meteoric_iron_block" ] } \ No newline at end of file diff --git a/src/main/java/dev/galacticraft/mod/Constant.java b/src/main/java/dev/galacticraft/mod/Constant.java index 02f286933..532ebcd68 100644 --- a/src/main/java/dev/galacticraft/mod/Constant.java +++ b/src/main/java/dev/galacticraft/mod/Constant.java @@ -363,7 +363,6 @@ interface Item { String OLIVINE_SHARD = "olivine_shard"; String DESH_STICK = "desh_stick"; String CARBON_FRAGMENTS = "carbon_fragments"; - String IRON_SHARD = "iron_shard"; String SOLAR_DUST = "solar_dust"; String BASIC_WAFER = "basic_wafer"; String ADVANCED_WAFER = "advanced_wafer"; diff --git a/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java b/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java index 0385e9e6e..eb9d6e4b0 100644 --- a/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java +++ b/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java @@ -130,7 +130,6 @@ public class GCCreativeModeTabs { output.accept(DESH_STICK); output.accept(CARBON_FRAGMENTS); - output.accept(IRON_SHARD); output.accept(SOLAR_DUST); output.accept(BASIC_WAFER); output.accept(ADVANCED_WAFER); diff --git a/src/main/java/dev/galacticraft/mod/content/item/GCItems.java b/src/main/java/dev/galacticraft/mod/content/item/GCItems.java index 0a52a598a..f886372bd 100644 --- a/src/main/java/dev/galacticraft/mod/content/item/GCItems.java +++ b/src/main/java/dev/galacticraft/mod/content/item/GCItems.java @@ -276,7 +276,6 @@ public class GCItems { public static final Item LUNAR_SAPPHIRE = new Item(new Item.Properties()); public static final Item DESH_STICK = new Item(new Item.Properties()); public static final Item CARBON_FRAGMENTS = new Item(new Item.Properties()); - public static final Item IRON_SHARD = new Item(new Item.Properties()); public static final Item SOLAR_DUST = new Item(new Item.Properties()); public static final Item BASIC_WAFER = new Item(new Item.Properties()); public static final Item ADVANCED_WAFER = new Item(new Item.Properties()); @@ -664,7 +663,6 @@ public static void register() { Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.LUNAR_SAPPHIRE), LUNAR_SAPPHIRE); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_STICK), DESH_STICK); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CARBON_FRAGMENTS), CARBON_FRAGMENTS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.IRON_SHARD), IRON_SHARD); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SOLAR_DUST), SOLAR_DUST); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BASIC_WAFER), BASIC_WAFER); Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ADVANCED_WAFER), ADVANCED_WAFER); diff --git a/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java b/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java index 42f074153..79927b441 100644 --- a/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java +++ b/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java @@ -382,7 +382,6 @@ public void generateItemModels(ItemModelGenerators generator) { generator.generateFlatItem(GCItems.OLIVINE_SHARD, ModelTemplates.FLAT_ITEM); generator.generateFlatItem(GCItems.DESH_STICK, ModelTemplates.FLAT_HANDHELD_ITEM); generator.generateFlatItem(GCItems.CARBON_FRAGMENTS, ModelTemplates.FLAT_ITEM); - generator.generateFlatItem(GCItems.IRON_SHARD, ModelTemplates.FLAT_ITEM); generator.generateFlatItem(GCItems.SOLAR_DUST, ModelTemplates.FLAT_ITEM); generator.generateFlatItem(GCItems.BASIC_WAFER, ModelTemplates.FLAT_ITEM); generator.generateFlatItem(GCItems.ADVANCED_WAFER, ModelTemplates.FLAT_ITEM); diff --git a/src/main/java/dev/galacticraft/mod/data/recipes/GCOreRecipeProvider.java b/src/main/java/dev/galacticraft/mod/data/recipes/GCOreRecipeProvider.java index 8139fd08c..e0893c8e3 100644 --- a/src/main/java/dev/galacticraft/mod/data/recipes/GCOreRecipeProvider.java +++ b/src/main/java/dev/galacticraft/mod/data/recipes/GCOreRecipeProvider.java @@ -60,7 +60,6 @@ public void buildRecipes(RecipeOutput output) { oreSmeltingAndBlasting(output, List.of(GCItems.RAW_LEAD, GCItems.GALENA_ORE), GCItems.LEAD_INGOT, 0.7f, 100); oreSmeltingAndBlasting(output, List.of(GCItems.MOON_COPPER_ORE, GCItems.LUNASLATE_COPPER_ORE), Items.COPPER_INGOT, 0.7f, 100); - oreSmeltingAndBlasting(output, List.of(GCItems.IRON_SHARD), Items.IRON_INGOT, 0.7f, 100); // Nuggets <-> Ingots nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.METEORIC_IRON_NUGGET, RecipeCategory.MISC, GCItems.METEORIC_IRON_INGOT, "meteoric_iron_ingot_from_nuggets", "meteoric_iron_ingot"); diff --git a/src/main/resources/assets/galacticraft/models/block/aluminum_wire_inventory.json b/src/main/resources/assets/galacticraft/models/block/aluminum_wire_inventory.json deleted file mode 100644 index 6a884b702..000000000 --- a/src/main/resources/assets/galacticraft/models/block/aluminum_wire_inventory.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "particle": "galacticraft:block/aluminum_wire", - "texture": "galacticraft:block/aluminum_wire" - }, - "elements": [ - { - "from": [2, 4, 6], - "to": [14, 8, 10], - "faces": { - "north": {"uv": [0, 0, 4, 12], "rotation": 90, "texture": "#texture"}, - "east": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "south": {"uv": [0, 0, 4, 12], "rotation": 90, "texture": "#texture"}, - "west": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "up": {"uv": [0, 0, 4, 12], "rotation": 270, "texture": "#texture"}, - "down": {"uv": [0, 0, 4, 12], "rotation": 90, "texture": "#texture"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [1, 1.5, 2], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [1, 135, 0], - "translation": [0, 1.5, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 135, 0], - "translation": [0, 1.5, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 225, 0], - "translation": [0, 1.5, 0] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/block/fallen_meteor.json b/src/main/resources/assets/galacticraft/models/block/fallen_meteor.json index 4ee0d85db..cfc9f86e8 100644 --- a/src/main/resources/assets/galacticraft/models/block/fallen_meteor.json +++ b/src/main/resources/assets/galacticraft/models/block/fallen_meteor.json @@ -14,95 +14,7 @@ "south": {"uv": [3, 5, 13, 15], "texture": "#texture", "tintindex": 0}, "west": {"uv": [3, 5, 13, 15], "texture": "#texture", "tintindex": 0}, "up": {"uv": [3, 3, 13, 13], "texture": "#texture", "tintindex": 0}, - "down": {"uv": [13, 13, 3, 3], "texture": "#texture", "tintindex": 0} - } - }, - { - "from": [5.5, 11, 4], - "to": [12.5, 11.5, 9.5], - "faces": { - "north": {"uv": [3.5, 4.5, 10.5, 5], "texture": "#texture", "tintindex": 0}, - "east": {"uv": [6.5, 4.5, 12, 5], "texture": "#texture", "tintindex": 0}, - "south": {"uv": [5.5, 4.5, 12.5, 5], "texture": "#texture", "tintindex": 0}, - "west": {"uv": [4, 4.5, 9.5, 5], "texture": "#texture", "tintindex": 0}, - "up": {"uv": [5.5, 4, 12.5, 9.5], "texture": "#texture", "tintindex": 0} - } - }, - { - "from": [2.5, 4, 5.5], - "to": [3, 9.5, 11.5], - "faces": { - "north": {"uv": [13, 6.5, 13.5, 12], "texture": "#texture", "tintindex": 0}, - "south": {"uv": [2.5, 6.5, 3, 12], "texture": "#texture", "tintindex": 0}, - "west": {"uv": [5.5, 6.5, 11.5, 12], "texture": "#texture", "tintindex": 0}, - "up": {"uv": [2.5, 5.5, 3, 11.5], "texture": "#texture", "tintindex": 0}, - "down": {"uv": [2.5, 4.5, 3, 10.5], "texture": "#texture", "tintindex": 0} - } - }, - { - "from": [5, 2.5, 2.5], - "to": [10, 7, 3], - "faces": { - "north": {"uv": [6, 9, 11, 13.5], "texture": "#texture", "tintindex": 0}, - "east": {"uv": [13, 9, 13.5, 13.5], "texture": "#texture", "tintindex": 0}, - "west": {"uv": [2.5, 9, 3, 13.5], "texture": "#texture", "tintindex": 0}, - "up": {"uv": [5, 2.5, 10, 3], "texture": "#texture", "tintindex": 0}, - "down": {"uv": [5, 13, 10, 13.5], "texture": "#texture", "tintindex": 0} - } - }, - { - "from": [13, 3, 4], - "to": [13.5, 9.5, 11.5], - "faces": { - "north": {"uv": [2.5, 6.5, 3, 13], "texture": "#texture", "tintindex": 0}, - "east": {"uv": [4.5, 6.5, 12, 13], "texture": "#texture", "tintindex": 0}, - "south": {"uv": [13, 6.5, 13.5, 13], "texture": "#texture", "tintindex": 0}, - "up": {"uv": [13, 4, 13.5, 11.5], "texture": "#texture", "tintindex": 0}, - "down": {"uv": [13, 4.5, 13.5, 12], "texture": "#texture", "tintindex": 0} - } - }, - { - "from": [6, 3.5, 13], - "to": [11, 9, 13.5], - "faces": { - "east": {"uv": [2.5, 7, 3, 12.5], "texture": "#texture", "tintindex": 0}, - "south": {"uv": [6, 7, 11, 12.5], "texture": "#texture", "tintindex": 0}, - "west": {"uv": [13, 7, 13.5, 12.5], "texture": "#texture", "tintindex": 0}, - "up": {"uv": [6, 13, 11, 13.5], "texture": "#texture", "tintindex": 0}, - "down": {"uv": [6, 2.5, 11, 3], "texture": "#texture", "tintindex": 0} - } - }, - { - "from": [5, 0.5, 5], - "to": [11, 1, 11.5], - "faces": { - "north": {"uv": [5, 15, 11, 15.5], "texture": "#texture", "tintindex": 0}, - "east": {"uv": [4.5, 15, 11, 15.5], "texture": "#texture", "tintindex": 0}, - "south": {"uv": [5, 15, 11, 15.5], "texture": "#texture", "tintindex": 0}, - "west": {"uv": [5, 15, 11.5, 15.5], "texture": "#texture", "tintindex": 0}, - "down": {"uv": [5, 4.5, 11, 11], "texture": "#texture", "tintindex": 0} - } - }, - { - "from": [4, 11, 9.5], - "to": [9.5, 11.5, 12.5], - "faces": { - "north": {"uv": [6.5, 4.5, 12, 5], "texture": "#texture", "tintindex": 0}, - "east": {"uv": [3.5, 4.5, 6.5, 5], "texture": "#texture", "tintindex": 0}, - "south": {"uv": [4, 4.5, 9.5, 5], "texture": "#texture", "tintindex": 0}, - "west": {"uv": [9.5, 4.5, 12.5, 5], "texture": "#texture", "tintindex": 0}, - "up": {"uv": [4, 9, 9.5, 12], "texture": "#texture", "tintindex": 0} - } - }, - { - "from": [6.5, 11.5, 6], - "to": [11, 12, 9], - "faces": { - "north": {"uv": [5, 4, 9.5, 4.5], "texture": "#texture", "tintindex": 0}, - "east": {"uv": [7, 4, 10, 4.5], "texture": "#texture", "tintindex": 0}, - "south": {"uv": [6.5, 4, 11, 4.5], "texture": "#texture", "tintindex": 0}, - "west": {"uv": [6, 4, 9, 4.5], "texture": "#texture", "tintindex": 0}, - "up": {"uv": [6.5, 6, 11, 9], "texture": "#texture", "tintindex": 0} + "down": {"uv": [13, 13, 3, 3], "texture": "#texture", "tintindex": 0, "cullface": "down"} } } ] diff --git a/src/main/resources/assets/galacticraft/models/block/glass_fluid_pipe_inventory.json b/src/main/resources/assets/galacticraft/models/block/glass_fluid_pipe_inventory.json deleted file mode 100644 index 0b1fd8800..000000000 --- a/src/main/resources/assets/galacticraft/models/block/glass_fluid_pipe_inventory.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "particle": "galacticraft:block/glass_fluid_pipe/white", - "texture": "galacticraft:block/glass_fluid_pipe/white" - }, - "elements": [ - { - "from": [2, 4, 6], - "to": [6, 8, 10], - "faces": { - "north": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "east": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "south": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "west": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#texture"} - } - }, - { - "from": [10, 4, 6], - "to": [14, 8, 10], - "faces": { - "north": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "east": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "south": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "west": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#texture"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#texture"} - } - }, - { - "from": [6, 4, 6], - "to": [10, 8, 10], - "faces": { - "north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#texture"}, - "south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#texture"}, - "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#texture"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [1, 1.5, 2], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [1, 135, 0], - "translation": [0, 1.5, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 135, 0], - "translation": [0, 1.5, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 225, 0], - "translation": [0, 1.5, 0] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/block/player_transport_tube.json b/src/main/resources/assets/galacticraft/models/block/player_transport_tube.json index 4544b7043..e35876e7a 100644 --- a/src/main/resources/assets/galacticraft/models/block/player_transport_tube.json +++ b/src/main/resources/assets/galacticraft/models/block/player_transport_tube.json @@ -1,10 +1,51 @@ { - "loader": "porting_lib:obj", - "model": "galacticraft:models/block/transport_tube/player_transport_tube.obj", - "mtl_override": "galacticraft:models/block/transport_tube/player_transport_tube.mtl", - "textures": { - "0": "galacticraft:block/oxygen_compressor" - }, - "automatic_culling": false, - "flip_v": true + "parent": "block/block", + "textures": { + "side": "galacticraft:block/transport_tube_side", + "top": "galacticraft:block/transport_tube_top", + "inner_side": "galacticraft:block/transport_tube_inner_side", + "particle": "galacticraft:block/transport_tube_side" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "down"} + } + }, + { + "from": [2, 0, 2], + "to": [2, 16, 14], + "faces": { + "east": {"uv": [2, 0, 14, 16], "texture": "#inner_side"} + } + }, + { + "from": [2, 0, 14], + "to": [14, 16, 14], + "faces": { + "north": {"uv": [2, 0, 14, 16], "texture": "#inner_side"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 16, 2], + "faces": { + "south": {"uv": [2, 0, 14, 16], "texture": "#inner_side"} + } + }, + { + "from": [14, 0, 2], + "to": [14, 16, 14], + "faces": { + "west": {"uv": [2, 0, 14, 16], "texture": "#inner_side"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/block/transport_tube/player_transport_tube.mtl b/src/main/resources/assets/galacticraft/models/block/transport_tube/player_transport_tube.mtl deleted file mode 100644 index e3556037d..000000000 --- a/src/main/resources/assets/galacticraft/models/block/transport_tube/player_transport_tube.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -Ns 500 -Ka 0.8 0.8 0.8 -Kd 0.8 0.8 0.8 -Ks 0.8 0.8 0.8 -d 1 -illum 2 -texture galacticraft:block/oxygen_compressor \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/block/transport_tube/player_transport_tube.obj b/src/main/resources/assets/galacticraft/models/block/transport_tube/player_transport_tube.obj deleted file mode 100644 index da118e891..000000000 --- a/src/main/resources/assets/galacticraft/models/block/transport_tube/player_transport_tube.obj +++ /dev/null @@ -1,453 +0,0 @@ -# Blender v3.0.1 OBJ File: '' -# www.blender.org -mtllib player_transport_tube.mtl -o Cylinder_Cylinder.002 -v 0.500000 -0.022341 -0.283512 -v 0.500000 1.022341 -0.283512 -v 0.891756 -0.022341 -0.178541 -v 0.891756 1.022341 -0.178541 -v 1.178541 -0.022341 0.108244 -v 1.178541 1.022341 0.108244 -v 1.283512 -0.022341 0.500000 -v 1.283512 1.022341 0.500000 -v 1.178541 -0.022341 0.891756 -v 1.178541 1.022341 0.891756 -v 0.891756 -0.022341 1.178541 -v 0.891756 1.022341 1.178541 -v 0.500000 -0.022341 1.283512 -v 0.500000 1.022341 1.283512 -v 0.108244 -0.022341 1.178541 -v 0.108244 1.022341 1.178541 -v -0.178541 -0.022341 0.891756 -v -0.178541 1.022341 0.891756 -v -0.283512 -0.022341 0.500000 -v -0.283512 1.022341 0.500000 -v -0.178541 -0.022341 0.108244 -v -0.178541 1.022341 0.108244 -v 0.108244 -0.022341 -0.178541 -v 0.108244 1.022341 -0.178541 -v 0.840335 -0.022341 -0.089477 -v 0.500000 -0.022341 -0.180669 -v 0.500000 1.022341 -0.180669 -v 0.840335 1.022341 -0.089477 -v 1.089477 -0.022341 0.159665 -v 1.089477 1.022341 0.159665 -v 1.180669 -0.022341 0.500000 -v 1.180669 1.022341 0.500000 -v 1.089477 -0.022341 0.840335 -v 1.089477 1.022341 0.840335 -v 0.840335 -0.022341 1.089477 -v 0.840335 1.022341 1.089477 -v 0.500000 -0.022341 1.180669 -v 0.500000 1.022341 1.180669 -v 0.159665 -0.022341 1.089477 -v 0.159665 1.022341 1.089477 -v -0.089477 -0.022341 0.840335 -v -0.089477 1.022341 0.840335 -v -0.180669 -0.022341 0.500000 -v -0.180669 1.022341 0.500000 -v -0.089477 -0.022341 0.159665 -v -0.089477 1.022341 0.159665 -v 0.159665 -0.022341 -0.089477 -v 0.159665 1.022341 -0.089477 -vt 0.538999 0.000000 -vt 0.538999 0.250000 -vt 0.482963 0.250000 -vt 0.482963 0.000000 -vt 0.659739 0.250000 -vt 0.659739 0.500000 -vt 0.603703 0.500000 -vt 0.603703 0.250000 -vt 0.538999 0.500000 -vt 0.538999 0.250000 -vt 0.482963 0.500000 -vt 0.482963 0.250000 -vt 0.659739 0.500000 -vt 0.659739 0.750000 -vt 0.603703 0.750000 -vt 0.603703 0.500000 -vt 0.538999 0.750000 -vt 0.538999 0.500000 -vt 0.482963 0.750000 -vt 0.482963 0.500000 -vt 0.836516 0.250000 -vt 0.836516 0.500000 -vt 0.780480 0.500000 -vt 0.780480 0.250000 -vt 0.715775 0.500000 -vt 0.715775 0.250000 -vt 0.659739 0.500000 -vt 0.659739 0.250000 -vt 0.659739 0.000000 -vt 0.659739 0.250000 -vt 0.603703 0.250000 -vt 0.603704 0.000000 -vt 0.104892 0.732963 -vt 0.153573 0.732963 -vt 0.153573 0.982963 -vt 0.104892 0.982963 -vt 0.482963 0.750000 -vt 0.531644 0.750000 -vt 0.531644 1.000000 -vt 0.482963 1.000000 -vt 0.587855 0.750000 -vt 0.587855 1.000000 -vt 0.636536 0.750000 -vt 0.636536 1.000000 -vt 0.153573 0.732963 -vt 0.202254 0.732963 -vt 0.202254 0.982963 -vt 0.153573 0.982963 -vt 0.258466 0.732963 -vt 0.258466 0.982963 -vt 0.307146 0.732963 -vt 0.307146 0.982963 -vt 0.836516 0.250000 -vt 0.885197 0.250000 -vt 0.885197 0.500000 -vt 0.836516 0.500000 -vt 0.941409 0.250000 -vt 0.941409 0.500000 -vt 0.990089 0.250000 -vt 0.990089 0.500000 -vt 0.000000 0.732963 -vt 0.048681 0.732963 -vt 0.048681 0.982963 -vt 0.000000 0.982963 -vt 0.088388 0.241481 -vt 0.092635 0.225633 -vt 0.148847 0.225633 -vt 0.153093 0.241481 -vt 0.032352 0.273834 -vt 0.043954 0.285435 -vt 0.015848 0.334116 -vt 0.000000 0.329870 -vt 0.241481 0.394575 -vt 0.225633 0.390328 -vt 0.225633 0.334116 -vt 0.241481 0.329870 -vt 0.209129 0.032352 -vt 0.197527 0.043954 -vt 0.148847 0.015848 -vt 0.153093 0.000000 -vt 0.000000 0.153093 -vt 0.015848 0.148847 -vt 0.043954 0.197527 -vt 0.032352 0.209129 -vt 0.000000 0.394575 -vt 0.015848 0.390328 -vt 0.043954 0.439009 -vt 0.032352 0.450610 -vt 0.209129 0.273834 -vt 0.197527 0.285435 -vt 0.148847 0.257330 -vt 0.153093 0.241481 -vt 0.088388 0.482963 -vt 0.092635 0.467115 -vt 0.148847 0.467115 -vt 0.153093 0.482963 -vt 0.241481 0.153093 -vt 0.225633 0.148847 -vt 0.225633 0.092635 -vt 0.241481 0.088388 -vt 0.032352 0.032352 -vt 0.043954 0.043954 -vt 0.015848 0.092635 -vt 0.000000 0.088388 -vt 0.197527 0.197527 -vt 0.209129 0.209129 -vt 0.088388 0.241481 -vt 0.092635 0.257330 -vt 0.209129 0.450610 -vt 0.197527 0.439009 -vt 0.092635 0.015848 -vt 0.088388 0.000000 -vn 0.2588 0.0000 -0.9659 -vn 0.7071 0.0000 -0.7071 -vn 0.9659 0.0000 -0.2588 -vn 0.9659 0.0000 0.2588 -vn 0.7071 0.0000 0.7071 -vn 0.2588 0.0000 0.9659 -vn -0.2588 0.0000 0.9659 -vn -0.7071 0.0000 0.7071 -vn -0.9659 0.0000 0.2588 -vn -0.9659 0.0000 -0.2588 -vn -0.7071 0.0000 -0.7071 -vn -0.2588 0.0000 -0.9659 -vn 0.0000 1.0000 0.0000 -vn 0.0000 -1.0000 0.0000 -usemtl None -s off -f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/8/3 6/7/3 8/9/3 7/10/3 -f 7/10/4 8/9/4 10/11/4 9/12/4 -f 9/13/5 10/14/5 12/15/5 11/16/5 -f 11/16/6 12/15/6 14/17/6 13/18/6 -f 13/18/7 14/17/7 16/19/7 15/20/7 -f 15/21/8 16/22/8 18/23/8 17/24/8 -f 17/24/9 18/23/9 20/25/9 19/26/9 -f 19/26/10 20/25/10 22/27/10 21/28/10 -f 21/29/11 22/30/11 24/31/11 23/32/11 -f 23/32/12 24/31/12 2/2/12 1/1/12 -f 26/33/7 25/34/7 28/35/7 27/36/7 -f 25/37/8 29/38/8 30/39/8 28/40/8 -f 29/38/9 31/41/9 32/42/9 30/39/9 -f 31/41/10 33/43/10 34/44/10 32/42/10 -f 33/45/11 35/46/11 36/47/11 34/48/11 -f 35/46/12 37/49/12 38/50/12 36/47/12 -f 37/49/1 39/51/1 40/52/1 38/50/1 -f 39/53/2 41/54/2 42/55/2 40/56/2 -f 41/54/3 43/57/3 44/58/3 42/55/3 -f 43/57/4 45/59/4 46/60/4 44/58/4 -f 45/61/5 47/62/5 48/63/5 46/64/5 -f 47/62/6 26/33/6 27/36/6 48/63/6 -f 22/65/13 46/66/13 48/67/13 24/68/13 -f 9/69/14 33/70/14 31/71/14 7/72/14 -f 19/73/14 43/74/14 41/75/14 17/76/14 -f 8/77/13 32/78/13 34/79/13 10/80/13 -f 18/81/13 42/82/13 44/83/13 20/84/13 -f 5/85/14 29/86/14 25/87/14 3/88/14 -f 15/89/14 39/90/14 37/91/14 13/92/14 -f 1/93/14 26/94/14 47/95/14 23/96/14 -f 4/97/13 28/98/13 30/99/13 6/100/13 -f 14/101/13 38/102/13 40/103/13 16/104/13 -f 24/68/13 48/67/13 27/105/13 2/106/13 -f 11/107/14 35/108/14 33/70/14 9/69/14 -f 21/109/14 45/110/14 43/74/14 19/73/14 -f 10/80/13 34/79/13 36/111/13 12/112/13 -f 20/84/13 44/83/13 46/66/13 22/65/13 -f 7/72/14 31/71/14 29/86/14 5/85/14 -f 17/76/14 41/75/14 39/90/14 15/89/14 -f 3/88/14 25/87/14 26/94/14 1/93/14 -f 6/100/13 30/99/13 32/78/13 8/77/13 -f 16/104/13 40/103/13 42/82/13 18/81/13 -f 13/92/14 37/91/14 35/108/14 11/107/14 -f 23/96/14 47/95/14 45/110/14 21/109/14 -f 2/106/13 27/105/13 28/98/13 4/97/13 -f 12/112/13 36/111/13 38/102/13 14/101/13 -o Cylinder.001_Cylinder.003 -v 0.500000 0.441615 -0.340954 -v 0.500000 0.558385 -0.340954 -v 0.920477 0.441615 -0.228288 -v 0.920477 0.558385 -0.228288 -v 1.228288 0.441615 0.079523 -v 1.228288 0.558385 0.079523 -v 1.340954 0.441615 0.500000 -v 1.340954 0.558385 0.500000 -v 1.228288 0.441615 0.920477 -v 1.228288 0.558385 0.920477 -v 0.920477 0.441615 1.228288 -v 0.920477 0.558385 1.228288 -v 0.500000 0.441615 1.340954 -v 0.500000 0.558385 1.340954 -v 0.079523 0.441615 1.228288 -v 0.079523 0.558385 1.228288 -v -0.228288 0.441615 0.920477 -v -0.228288 0.558385 0.920477 -v -0.340954 0.441615 0.500000 -v -0.340954 0.558385 0.500000 -v -0.228288 0.441615 0.079523 -v -0.228288 0.558385 0.079523 -v 0.079523 0.441615 -0.228288 -v 0.079523 0.558385 -0.228288 -v 0.865286 0.441615 -0.132694 -v 0.500000 0.441615 -0.230572 -v 0.500000 0.558385 -0.230572 -v 0.865286 0.558385 -0.132694 -v 1.132694 0.441615 0.134714 -v 1.132694 0.558385 0.134714 -v 1.230572 0.441615 0.500000 -v 1.230572 0.558385 0.500000 -v 1.132694 0.441615 0.865286 -v 1.132694 0.558385 0.865286 -v 0.865286 0.441615 1.132694 -v 0.865286 0.558385 1.132694 -v 0.500000 0.441615 1.230572 -v 0.500000 0.558385 1.230572 -v 0.134714 0.441615 1.132694 -v 0.134714 0.558385 1.132694 -v -0.132694 0.441615 0.865286 -v -0.132694 0.558385 0.865286 -v -0.230572 0.441615 0.500000 -v -0.230572 0.558385 0.500000 -v -0.132694 0.441615 0.134714 -v -0.132694 0.558385 0.134714 -v 0.134714 0.441615 -0.132694 -v 0.134714 0.558385 -0.132694 -vt 0.056036 0.482963 -vt 0.056036 0.732963 -vt 0.000000 0.732963 -vt 0.000000 0.482963 -vt 0.353553 0.482963 -vt 0.353553 0.732963 -vt 0.297517 0.732963 -vt 0.297517 0.482963 -vt 0.232813 0.732963 -vt 0.232813 0.482963 -vt 0.176777 0.732963 -vt 0.176777 0.482963 -vt 0.836516 0.000000 -vt 0.836516 0.250000 -vt 0.780480 0.250000 -vt 0.780480 0.000000 -vt 0.715775 0.250000 -vt 0.715775 0.000000 -vt 0.659739 0.250000 -vt 0.659739 0.000000 -vt 0.836516 0.500000 -vt 0.836516 0.750000 -vt 0.780480 0.750000 -vt 0.780480 0.500000 -vt 0.715775 0.750000 -vt 0.715775 0.500000 -vt 0.659739 0.750000 -vt 0.659739 0.500000 -vt 0.176777 0.482963 -vt 0.176777 0.732963 -vt 0.120741 0.732963 -vt 0.120741 0.482963 -vt 0.412039 0.732963 -vt 0.460720 0.732963 -vt 0.460720 0.982963 -vt 0.412039 0.982963 -vt 0.659739 0.750000 -vt 0.708420 0.750000 -vt 0.708420 1.000000 -vt 0.659739 1.000000 -vt 0.764632 0.750000 -vt 0.764632 1.000000 -vt 0.813313 0.750000 -vt 0.813313 1.000000 -vt 0.836516 0.000000 -vt 0.885197 0.000000 -vt 0.885197 0.250000 -vt 0.836516 0.250000 -vt 0.941409 0.000000 -vt 0.941409 0.250000 -vt 0.990089 0.000000 -vt 0.990089 0.250000 -vt 0.836516 0.500000 -vt 0.885197 0.500000 -vt 0.885197 0.750000 -vt 0.836516 0.750000 -vt 0.941409 0.500000 -vt 0.941409 0.750000 -vt 0.990089 0.500000 -vt 0.990089 0.750000 -vt 0.307146 0.732963 -vt 0.355827 0.732963 -vt 0.355827 0.982963 -vt 0.307146 0.982963 -vt 0.329870 0.241481 -vt 0.334116 0.225633 -vt 0.390328 0.225633 -vt 0.394575 0.241481 -vt 0.273834 0.273834 -vt 0.285435 0.285435 -vt 0.257330 0.334116 -vt 0.241481 0.329870 -vt 0.482963 0.394575 -vt 0.467115 0.390328 -vt 0.467115 0.334116 -vt 0.482963 0.329870 -vt 0.450610 0.032352 -vt 0.439009 0.043954 -vt 0.390328 0.015848 -vt 0.394574 0.000000 -vt 0.241481 0.153093 -vt 0.257330 0.148847 -vt 0.285436 0.197527 -vt 0.273834 0.209129 -vt 0.241481 0.394575 -vt 0.257330 0.390328 -vt 0.285435 0.439009 -vt 0.273834 0.450610 -vt 0.450610 0.273834 -vt 0.439009 0.285435 -vt 0.390328 0.257330 -vt 0.394575 0.241481 -vt 0.329870 0.482963 -vt 0.334116 0.467115 -vt 0.390328 0.467115 -vt 0.394575 0.482963 -vt 0.482963 0.153093 -vt 0.467115 0.148847 -vt 0.467115 0.092635 -vt 0.482963 0.088388 -vt 0.273834 0.032352 -vt 0.285435 0.043954 -vt 0.257330 0.092635 -vt 0.241481 0.088388 -vt 0.439009 0.197527 -vt 0.450610 0.209129 -vt 0.329870 0.241481 -vt 0.334116 0.257330 -vt 0.450610 0.450610 -vt 0.439009 0.439009 -vt 0.334116 0.015848 -vt 0.329870 0.000000 -vn 0.2588 0.0000 -0.9659 -vn 0.7071 0.0000 -0.7071 -vn 0.9659 0.0000 -0.2588 -vn 0.9659 0.0000 0.2588 -vn 0.7071 0.0000 0.7071 -vn 0.2588 0.0000 0.9659 -vn -0.2588 0.0000 0.9659 -vn -0.7071 0.0000 0.7071 -vn -0.9659 0.0000 0.2588 -vn -0.9659 0.0000 -0.2588 -vn -0.7071 0.0000 -0.7071 -vn -0.2588 0.0000 -0.9659 -vn 0.0000 1.0000 0.0000 -vn 0.0000 -1.0000 0.0000 -usemtl None -s off -f 49/113/15 50/114/15 52/115/15 51/116/15 -f 51/117/16 52/118/16 54/119/16 53/120/16 -f 53/120/17 54/119/17 56/121/17 55/122/17 -f 55/122/18 56/121/18 58/123/18 57/124/18 -f 57/125/19 58/126/19 60/127/19 59/128/19 -f 59/128/20 60/127/20 62/129/20 61/130/20 -f 61/130/21 62/129/21 64/131/21 63/132/21 -f 63/133/22 64/134/22 66/135/22 65/136/22 -f 65/136/23 66/135/23 68/137/23 67/138/23 -f 67/138/24 68/137/24 70/139/24 69/140/24 -f 69/141/25 70/142/25 72/143/25 71/144/25 -f 71/144/26 72/143/26 50/114/26 49/113/26 -f 74/145/21 73/146/21 76/147/21 75/148/21 -f 73/149/22 77/150/22 78/151/22 76/152/22 -f 77/150/23 79/153/23 80/154/23 78/151/23 -f 79/153/24 81/155/24 82/156/24 80/154/24 -f 81/157/25 83/158/25 84/159/25 82/160/25 -f 83/158/26 85/161/26 86/162/26 84/159/26 -f 85/161/15 87/163/15 88/164/15 86/162/15 -f 87/165/16 89/166/16 90/167/16 88/168/16 -f 89/166/17 91/169/17 92/170/17 90/167/17 -f 91/169/18 93/171/18 94/172/18 92/170/18 -f 93/173/19 95/174/19 96/175/19 94/176/19 -f 95/174/20 74/145/20 75/148/20 96/175/20 -f 70/177/27 94/178/27 96/179/27 72/180/27 -f 57/181/28 81/182/28 79/183/28 55/184/28 -f 67/185/28 91/186/28 89/187/28 65/188/28 -f 56/189/27 80/190/27 82/191/27 58/192/27 -f 66/193/27 90/194/27 92/195/27 68/196/27 -f 53/197/28 77/198/28 73/199/28 51/200/28 -f 63/201/28 87/202/28 85/203/28 61/204/28 -f 49/205/28 74/206/28 95/207/28 71/208/28 -f 52/209/27 76/210/27 78/211/27 54/212/27 -f 62/213/27 86/214/27 88/215/27 64/216/27 -f 72/180/27 96/179/27 75/217/27 50/218/27 -f 59/219/28 83/220/28 81/182/28 57/181/28 -f 69/221/28 93/222/28 91/186/28 67/185/28 -f 58/192/27 82/191/27 84/223/27 60/224/27 -f 68/196/27 92/195/27 94/178/27 70/177/27 -f 55/184/28 79/183/28 77/198/28 53/197/28 -f 65/188/28 89/187/28 87/202/28 63/201/28 -f 51/200/28 73/199/28 74/206/28 49/205/28 -f 54/212/27 78/211/27 80/190/27 56/189/27 -f 64/216/27 88/215/27 90/194/27 66/193/27 -f 61/204/28 85/203/28 83/220/28 59/219/28 -f 71/208/28 95/207/28 93/222/28 69/221/28 -f 50/218/27 75/217/27 76/210/27 52/209/27 -f 60/224/27 84/223/27 86/214/27 62/213/27 diff --git a/src/main/resources/assets/galacticraft/models/item/aluminum_wire.json b/src/main/resources/assets/galacticraft/models/item/aluminum_wire.json new file mode 100644 index 000000000..67fd31a7f --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/item/aluminum_wire.json @@ -0,0 +1,20 @@ +{ + "parent": "galacticraft:item/template_wire", + "textures": { + "texture": "galacticraft:block/aluminum_wire" + }, + "elements": [ + { + "from": [2, 4, 6], + "to": [14, 8, 10], + "faces": { + "north": {"uv": [0, 0, 4, 12], "rotation": 90, "texture": "#texture"}, + "east": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "south": {"uv": [0, 0, 4, 12], "rotation": 90, "texture": "#texture"}, + "west": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "up": {"uv": [0, 0, 4, 12], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [0, 0, 4, 12], "rotation": 90, "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/item/glass_fluid_pipe.json b/src/main/resources/assets/galacticraft/models/item/glass_fluid_pipe.json new file mode 100644 index 000000000..dfe1e6bb6 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/item/glass_fluid_pipe.json @@ -0,0 +1,6 @@ +{ + "parent": "galacticraft:item/template_glass_fluid_pipe", + "textures": { + "texture": "galacticraft:block/glass_fluid_pipe/glass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/item/template_glass_fluid_pipe.json b/src/main/resources/assets/galacticraft/models/item/template_glass_fluid_pipe.json new file mode 100644 index 000000000..fdbe3b974 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/item/template_glass_fluid_pipe.json @@ -0,0 +1,39 @@ +{ + "parent": "galacticraft:item/template_wire", + "elements": [ + { + "from": [2, 4, 6], + "to": [6, 8, 10], + "faces": { + "north": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "east": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "south": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "west": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "up": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#texture"} + } + }, + { + "from": [6, 4, 6], + "to": [10, 8, 10], + "faces": { + "north": {"uv": [0, 6, 4, 10], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [0, 6, 4, 10], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [0, 6, 4, 10], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [0, 6, 4, 10], "rotation": 90, "texture": "#texture"} + } + }, + { + "from": [10, 4, 6], + "to": [14, 8, 10], + "faces": { + "north": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "east": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "south": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "west": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "up": {"uv": [12, 0, 16, 4], "texture": "#texture"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/item/template_wire.json b/src/main/resources/assets/galacticraft/models/item/template_wire.json new file mode 100644 index 000000000..edb8c2529 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/item/template_wire.json @@ -0,0 +1,24 @@ +{ + "parent": "block/block", + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [1, 1.5, 2], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [1, 135, 0], + "translation": [0, 1.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 135, 0], + "translation": [0, 1.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, 1.5, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/textures/block/glass_fluid_pipe/glass.png b/src/main/resources/assets/galacticraft/textures/block/glass_fluid_pipe/glass.png new file mode 100644 index 000000000..85b61bfab Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/block/glass_fluid_pipe/glass.png differ diff --git a/src/main/resources/assets/galacticraft/textures/block/venus_rock_block_scorched.png b/src/main/resources/assets/galacticraft/textures/block/venus_rock_block_scorched.png deleted file mode 100644 index d536db545..000000000 Binary files a/src/main/resources/assets/galacticraft/textures/block/venus_rock_block_scorched.png and /dev/null differ diff --git a/src/main/resources/assets/galacticraft/textures/item/aluminum_nugget.png b/src/main/resources/assets/galacticraft/textures/item/aluminum_nugget.png new file mode 100644 index 000000000..5e400946e Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/item/aluminum_nugget.png differ diff --git a/src/main/resources/assets/galacticraft/textures/item/desh_nugget.png b/src/main/resources/assets/galacticraft/textures/item/desh_nugget.png new file mode 100644 index 000000000..6aa17dcac Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/item/desh_nugget.png differ diff --git a/src/main/resources/assets/galacticraft/textures/item/iron_shard.png b/src/main/resources/assets/galacticraft/textures/item/iron_shard.png deleted file mode 100644 index aba2b8ccb..000000000 Binary files a/src/main/resources/assets/galacticraft/textures/item/iron_shard.png and /dev/null differ diff --git a/src/main/resources/assets/galacticraft/textures/item/lead_nugget.png b/src/main/resources/assets/galacticraft/textures/item/lead_nugget.png new file mode 100644 index 000000000..1f1ada062 Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/item/lead_nugget.png differ diff --git a/src/main/resources/assets/galacticraft/textures/item/meteoric_iron_nugget.png b/src/main/resources/assets/galacticraft/textures/item/meteoric_iron_nugget.png new file mode 100644 index 000000000..1e143fd53 Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/item/meteoric_iron_nugget.png differ diff --git a/src/main/resources/assets/galacticraft/textures/item/tin_nugget.png b/src/main/resources/assets/galacticraft/textures/item/tin_nugget.png new file mode 100644 index 000000000..e45dbcfcc Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/item/tin_nugget.png differ diff --git a/src/main/resources/assets/galacticraft/textures/item/titanium_nugget.png b/src/main/resources/assets/galacticraft/textures/item/titanium_nugget.png new file mode 100644 index 000000000..566dfe517 Binary files /dev/null and b/src/main/resources/assets/galacticraft/textures/item/titanium_nugget.png differ