diff --git a/assets/block-test.bbmodel b/assets/block-test.bbmodel new file mode 100644 index 0000000..2067abf --- /dev/null +++ b/assets/block-test.bbmodel @@ -0,0 +1 @@ +{"meta":{"format_version":"4.9","model_format":"free","box_uv":false},"name":"tungsten","model_identifier":"tungsten-block","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-8,0,-8],"to":[8,16,8],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"be328549-3163-905a-fb5e-4cb5d39e10bc"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[47,0,29],"to":[63,16,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"9c82c603-1963-8243-6f79-3bedd949633e"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[63,0,29],"to":[79,16,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"e680285f-cfb5-2814-5dc7-0902170a14e4"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[47,16,29],"to":[63,32,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"d94ac2e7-178a-0115-68a6-3cb02ec79e25"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[63,16,29],"to":[79,32,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"9a038278-7e4c-6c9f-ddb5-026709561b10"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[63,32,29],"to":[79,48,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"ea8ba793-9789-5bf1-6b2e-ffa0bdf73c7a"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[95,32,29],"to":[111,48,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"74fc18f0-111a-cf09-8660-9c42d7100aab"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[79,32,29],"to":[95,48,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"2b7a44b3-4e69-b28c-8a18-39e995a60cc0"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[95,16,29],"to":[111,32,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"794ddeff-0ff9-757b-571c-4f7537987663"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[79,16,29],"to":[95,32,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"c3566d8a-783a-4f79-cb96-679c516f10e1"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[79,0,29],"to":[95,16,45],"autouv":1,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":3},"east":{"uv":[0,0,16,16],"texture":3},"south":{"uv":[0,0,16,16],"texture":3},"west":{"uv":[0,0,16,16],"texture":3},"up":{"uv":[0,0,16,16],"texture":3},"down":{"uv":[0,0,16,16],"texture":3}},"type":"cube","uuid":"b15fa0e9-d22c-08aa-6e6e-36f834d04f6a"}],"outliner":["be328549-3163-905a-fb5e-4cb5d39e10bc","9c82c603-1963-8243-6f79-3bedd949633e","e680285f-cfb5-2814-5dc7-0902170a14e4","9a038278-7e4c-6c9f-ddb5-026709561b10","d94ac2e7-178a-0115-68a6-3cb02ec79e25","ea8ba793-9789-5bf1-6b2e-ffa0bdf73c7a","b15fa0e9-d22c-08aa-6e6e-36f834d04f6a","c3566d8a-783a-4f79-cb96-679c516f10e1","794ddeff-0ff9-757b-571c-4f7537987663","2b7a44b3-4e69-b28c-8a18-39e995a60cc0","74fc18f0-111a-cf09-8660-9c42d7100aab"],"textures":[{"path":"M:\\Downloads\\Games\\Minecraft\\@assets\\jah-textures\\tungsten-block.png","name":"tungsten-block.png","folder":"","namespace":"","id":"0","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"04168e6e-b338-c230-2e2a-fef9566f178b","relative_path":"../tungsten-block.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAZFJREFUOE91U4tuwjAMPDtF66b9/18NRqFiD237DVAae/IjhSGtUmlMHPt8d6H58KMAoNog2vzbHyKA7AdAWwStKRAhSiGUwqDj9KGqhCYCkQYVic2BPVHE60OjDbyCKogJzAQ6TCeVplDLsG6qUJAv7V2qFY59Q5OAEgWDXrezOrR8rE4kwzt0JPeH1zGn/SkxGsAsZEVyXav0sW+4YTAxiBm0330aPogKllY9KXmKNRHEYQUD9jyNz/6/Iz3uvzQCwaWerwVSgSHJXNtnBiFIpuP0nvza58qFS9cENsI4Dn/P30SuggtkTHe5koNam9c0hC6ZoTL5LC4xKG1fZuegq9wPXKWLAn1ma+OUSMq6285qtUz7ZWnmgNUDnUQjK+QNiR/GIS2jYaSYV92ucejfkWOfCZ3clUSzsood5pVLr+zw1G3uhdOhdg8soPnw7TfEkttysWsSdr4xk8EWqUFmuXZnerQR3vRyXoJEJzMY6caJKEguPKAUe4ubazNsgoNO0v3knYsUCYVHdAMBPi9+AbzdBdoxVWD5AAAAAElFTkSuQmCC"},{"path":"M:\\Downloads\\Games\\Minecraft\\@assets\\jah-textures\\tungsten-block-2.png","name":"tungsten-block-2.png","folder":"","namespace":"","id":"1","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"b5c32a3e-49bc-db93-943d-af624d1a766d","relative_path":"../tungsten-block-2.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAatJREFUOE9tUwFu2zAMPFJKkf3/VVu6IGmyAWuH/WJYO4vkcKTspMUEB3Zk6nh3PMvj4VsIBKqoJQEVgTaZG3ULDwwLuDtUe+2FQ86nl5gn8zbGWxZFBAjcurKSFyCCh90ekt0iQeXr4RosLsSCak3RurAeZgRiuWAMg2qDCKFZH5Dj43UeuzEWFXR2vlsEsuGl8k6dPJ1/pgfBHiIwWwBYskCKqGpzUuZhSpq+8Mzp+JwS3EfuasPWXeUTAHZlg6L8jtUYkMPnS+7yZdOO1vhr8Ajs+g5/l99YFnt38P6PnE/fN9imew50vk++8HhNcNKnzHmVkQLI5ek5d90BG4Nsi02T9EFlPydk8DBE3NhMgJcQaalzlWLjDzgJ1UwCIgTmDndDuBf4nFLmANCimdO+GUUGfadwY5Ci5pd1kz4lrB6smj66xdkzA+siTgZIUAwPXy6x5oIgqxQVzchqq/CUeVsAtmc5HX8EtVFt7w+JvsaVz8Z8MCfhGBkyIMGnHLmef9VsiCl0uIKzjTMq+/zy3pbX+la0Q2k8PaCE/b4+z/+tFajof0iiOf4BvpMLV54cNYoAAAAASUVORK5CYII="},{"path":"M:\\Downloads\\Games\\Minecraft\\@assets\\jah-textures\\etherial_glass.png","name":"etherial_glass.png","folder":"","namespace":"","id":"2","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"5ef301cf-e65f-8f3f-989d-82efe14aabee","relative_path":"../etherial_glass.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAWlJREFUOE+lk82KFEEMgL9UqrtntnVnBUdQUERQbyo+gy+yB9En1H0GfQFhPakI6kHnsMp0VxKphZGWmWUHNrdUki+p/MjLk/FFIv+QYLUOzthDOqEPYeGUpbw6iaeD83WPuC2XNnFHXr+N+9PM6twjc5CwQwliGhWChOmpZn6tjaiVyPGbWG6cmsRdh14K5pnv7qymgEZ4LNihu34sws9q+weowfUhOfMx8a0GN4X5IHRtwS0h6gQzbiO2GF3fbQFG53N2HpbE6TksOBidokaqeiizrPxRsSdD6PtLAQzMRDBz5toQ40DXKKumtWd7AWJN75lxFuigDDHQ9y1nluz5XoDOaAfnmgm5KfgauLSCDh5tmlj/OK/ZhZyNKIrgXE/ZHlzcxOAGwc1dY0yJRSrcioya82H3GIUvVjhSYWl1bBPRhJREovDbEp/+A1Rlswt1nLtWe5d9a5U3ThfdxhR+vspXPqarnvNfolfrjeVHmJAAAAAASUVORK5CYII="},{"path":"M:\\Downloads\\Games\\Minecraft\\@assets\\jah-textures\\etherial_glass-tinted.png","name":"etherial_glass-tinted.png","folder":"","namespace":"","id":"3","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"abc2db99-9bdb-2d19-f808-856f2d12647a","relative_path":"../etherial_glass-tinted.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAXJJREFUOE+lk8tOwkAUhjlzKVOopQipl5ULY6IYEzcmxqUmRve+iI/gI/gGPo973bjQjYsGSEUobedmpnEISCVN6HL+//96Zs45cHn3dA7jrxSP4hzzmNcqfJIGVPqBo70Wg6ubx1Nn8D6pkFuy5J29JlxfPPTm/yyC/Y0cUyqwx8qgbPQxcNIoM5qpBG7P7g+s0YYRBoVG/ak1Wj3pHG4a8DxkBjBhY+SEETyOEhPWdZ9wYBghqS0kd0PPQPzo+dOcLQBI/PadhkcBi15iIxYALjSlBBAXmjMX03Qqv7q9rWoA8IlEmVLUpVjWlEAuxmKYJ52T7WoAW4EmoGUildOitWwskp2KAEANnDZbVCkE9g1o2s9WVjDtHrftI5qQkHVEKZ4BhNt2Js3d9r9XyFlYV37XLWuj1ZTUqDF4HS51wRyYThij9MIGIDVrX9EVhUBrCY7k3PgWAEW5v7Ngxb+TWKaXjvKqvZiHF6O89jKtu84/5XoF8vUrBn8AAAAASUVORK5CYII="}]} \ No newline at end of file diff --git a/assets/ethereal.afdesign b/assets/ethereal.afdesign new file mode 100644 index 0000000..b5f6082 Binary files /dev/null and b/assets/ethereal.afdesign differ diff --git a/assets/tungsten.afdesign b/assets/tungsten.afdesign new file mode 100644 index 0000000..fb3b952 Binary files /dev/null and b/assets/tungsten.afdesign differ diff --git a/assets/tungsten_block.afdesign b/assets/tungsten_block.afdesign index 0496d48..4bae224 100644 Binary files a/assets/tungsten_block.afdesign and b/assets/tungsten_block.afdesign differ diff --git a/assets/tungsten_ingot.afdesign b/assets/tungsten_ingot.afdesign index 881c7d4..70194ec 100644 Binary files a/assets/tungsten_ingot.afdesign and b/assets/tungsten_ingot.afdesign differ diff --git a/src/main/java/net/banutama/utamacraft/block/custom/TintedEtherealGlassBlock.java b/src/main/java/net/banutama/utamacraft/block/custom/EtherealGlassTintedBlock.java similarity index 75% rename from src/main/java/net/banutama/utamacraft/block/custom/TintedEtherealGlassBlock.java rename to src/main/java/net/banutama/utamacraft/block/custom/EtherealGlassTintedBlock.java index d3561df..a447c51 100644 --- a/src/main/java/net/banutama/utamacraft/block/custom/TintedEtherealGlassBlock.java +++ b/src/main/java/net/banutama/utamacraft/block/custom/EtherealGlassTintedBlock.java @@ -4,7 +4,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; -public class TintedEtherealGlassBlock extends EtherealGlassBlock { +public class EtherealGlassTintedBlock extends EtherealGlassBlock { @Override public int getLightBlock(BlockState state, BlockGetter world, BlockPos pos) { return world.getMaxLightLevel(); @@ -12,6 +12,6 @@ public class TintedEtherealGlassBlock extends EtherealGlassBlock { @Override protected String getTooltip() { - return "tooltip.utamacraft.tinted_ethereal_glass"; + return "tooltip.utamacraft.ethereal_glass_tinted"; } } diff --git a/src/main/java/net/banutama/utamacraft/block/custom/ModBlocks.java b/src/main/java/net/banutama/utamacraft/block/custom/ModBlocks.java index 26a5b71..8c133e0 100644 --- a/src/main/java/net/banutama/utamacraft/block/custom/ModBlocks.java +++ b/src/main/java/net/banutama/utamacraft/block/custom/ModBlocks.java @@ -3,9 +3,6 @@ package net.banutama.utamacraft.block.custom; import java.util.function.Supplier; import net.banutama.utamacraft.Utamacraft; -import net.banutama.utamacraft.block.custom.EtherealGlassBlock; -import net.banutama.utamacraft.block.custom.TintedEtherealGlassBlock; -import net.banutama.utamacraft.block.custom.InsolatorBlock; import net.banutama.utamacraft.item.ModCreativeModeTab; import net.banutama.utamacraft.item.ModItems; import net.minecraft.util.valueproviders.UniformInt; @@ -27,8 +24,8 @@ public class ModBlocks { public static final RegistryObject ETHEREAL_GLASS = registerBlock("ethereal_glass", EtherealGlassBlock::new); - public static final RegistryObject TINTED_ETHEREAL_GLASS = - registerBlock("tinted_ethereal_glass", TintedEtherealGlassBlock::new); + public static final RegistryObject ETHEREAL_GLASS_TINTED = + registerBlock("ethereal_glass_tinted", EtherealGlassTintedBlock::new); public static final RegistryObject TUNGSTEN_ORE = registerBlock("tungsten_ore", () -> new DropExperienceBlock(BlockBehaviour.Properties.of(Material.STONE) diff --git a/src/main/java/net/banutama/utamacraft/item/ModItems.java b/src/main/java/net/banutama/utamacraft/item/ModItems.java index ea48598..94b1bf7 100644 --- a/src/main/java/net/banutama/utamacraft/item/ModItems.java +++ b/src/main/java/net/banutama/utamacraft/item/ModItems.java @@ -17,8 +17,8 @@ public class ModItems { ITEMS.register("player_peripheral", PlayerPeripheralItem::new); public static final RegistryObject TUNGSTEN_INGOT = ITEMS.register("tungsten_ingot", ModItems::simpleItem); - public static final RegistryObject RAW_TUNGSTEN = - ITEMS.register("raw_tungsten", ModItems::simpleItem); + public static final RegistryObject TUNGSTEN_RAW = + ITEMS.register("tungsten_raw", ModItems::simpleItem); public static final RegistryObject FIBER_GLASS = ITEMS.register("fiber_glass", ModItems::simpleItem); public static final RegistryObject PCB = diff --git a/src/main/resources/assets/utamacraft/blockstates/ethereal_glass_tinted.json b/src/main/resources/assets/utamacraft/blockstates/ethereal_glass_tinted.json new file mode 100644 index 0000000..cf69a07 --- /dev/null +++ b/src/main/resources/assets/utamacraft/blockstates/ethereal_glass_tinted.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "utamacraft:block/ethereal_glass_tinted" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/utamacraft/blockstates/tinted_ethereal_glass.json b/src/main/resources/assets/utamacraft/blockstates/tinted_ethereal_glass.json deleted file mode 100644 index e53179e..0000000 --- a/src/main/resources/assets/utamacraft/blockstates/tinted_ethereal_glass.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "utamacraft:block/tinted_ethereal_glass" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/utamacraft/lang/en_us.json b/src/main/resources/assets/utamacraft/lang/en_us.json index f2fbb17..405e5e7 100644 --- a/src/main/resources/assets/utamacraft/lang/en_us.json +++ b/src/main/resources/assets/utamacraft/lang/en_us.json @@ -1,8 +1,8 @@ { "block.utamacraft.deepslate_tungsten_ore": "Deepslate Tungsten Ore", "block.utamacraft.ethereal_glass": "Ethereal Glass", + "block.utamacraft.ethereal_glass_tinted": "Tinted Ethereal Glass", "block.utamacraft.insolator": "Insolator", - "block.utamacraft.tinted_ethereal_glass": "Tinted Ethereal Glass", "block.utamacraft.tungsten_block": "Tungsten Block", "block.utamacraft.tungsten_ore": "Tungsten Ore", "block_entity.utamacraft.insolator": "Insolator", @@ -12,7 +12,7 @@ "item.utamacraft.insolator": "Insolator", "item.utamacraft.pcb": "Printed Circuit Board", "item.utamacraft.player_peripheral": "Player peripheral", - "item.utamacraft.raw_tungsten": "Raw Tungsten", + "item.utamacraft.tungsten_raw": "Raw Tungsten", "item.utamacraft.tungsten_block": "Tungsten Block", "item.utamacraft.tungsten_ingot": "Tungsten Ingot", "item.utamacraft.utamacraft_logo": "Utamacraft", @@ -21,11 +21,11 @@ "tooltip.utamacraft.energy.amount": "%s FE", "tooltip.utamacraft.energy.amount.with_capacity": "%s / %s FE", "tooltip.utamacraft.ethereal_glass": "Glass that is not solid to players", + "tooltip.utamacraft.ethereal_glass_tinted": "Glass that is not solid to players and blocks light", "tooltip.utamacraft.fire_ward": "Protects the player from fire damage", "tooltip.utamacraft.fluid.empty": "Empty", "tooltip.utamacraft.fluid.amount": "%s mB", "tooltip.utamacraft.fluid.amount.with_capacity": "%s / %s mB", - "tooltip.utamacraft.tinted_ethereal_glass": "Glass that is not solid to players and blocks light", "turtle.utamacraft.player_turtle": "Player", "gui.utamacraft.insolator.dump": "Dump", "gui.utamacraft.insolator.dump.tooltip": "Dump the fluid contents of the Insolator", diff --git a/src/main/resources/assets/utamacraft/models/block/tinted_ethereal_glass.json b/src/main/resources/assets/utamacraft/models/block/ethereal_glass_tinted.json similarity index 62% rename from src/main/resources/assets/utamacraft/models/block/tinted_ethereal_glass.json rename to src/main/resources/assets/utamacraft/models/block/ethereal_glass_tinted.json index f18aedb..e510002 100644 --- a/src/main/resources/assets/utamacraft/models/block/tinted_ethereal_glass.json +++ b/src/main/resources/assets/utamacraft/models/block/ethereal_glass_tinted.json @@ -2,6 +2,6 @@ "parent": "block/cube_all", "render_type": "translucent", "textures": { - "all": "utamacraft:block/tinted_ethereal_glass" + "all": "utamacraft:block/ethereal_glass_tinted" } } \ No newline at end of file diff --git a/src/main/resources/assets/utamacraft/models/item/ethereal_glass_tinted.json b/src/main/resources/assets/utamacraft/models/item/ethereal_glass_tinted.json new file mode 100644 index 0000000..4c98cde --- /dev/null +++ b/src/main/resources/assets/utamacraft/models/item/ethereal_glass_tinted.json @@ -0,0 +1,3 @@ +{ + "parent": "utamacraft:block/ethereal_glass_tinted" +} \ No newline at end of file diff --git a/src/main/resources/assets/utamacraft/models/item/tinted_ethereal_glass.json b/src/main/resources/assets/utamacraft/models/item/tinted_ethereal_glass.json deleted file mode 100644 index ec39cf9..0000000 --- a/src/main/resources/assets/utamacraft/models/item/tinted_ethereal_glass.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "utamacraft:block/tinted_ethereal_glass" -} \ No newline at end of file diff --git a/src/main/resources/assets/utamacraft/models/item/raw_tungsten.json b/src/main/resources/assets/utamacraft/models/item/tungsten_raw.json similarity index 54% rename from src/main/resources/assets/utamacraft/models/item/raw_tungsten.json rename to src/main/resources/assets/utamacraft/models/item/tungsten_raw.json index 83a972f..a7e65ad 100644 --- a/src/main/resources/assets/utamacraft/models/item/raw_tungsten.json +++ b/src/main/resources/assets/utamacraft/models/item/tungsten_raw.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "utamacraft:item/raw_tungsten" + "layer0": "utamacraft:item/tungsten_raw" } } \ No newline at end of file diff --git a/src/main/resources/assets/utamacraft/textures/block/ethereal_glass.png b/src/main/resources/assets/utamacraft/textures/block/ethereal_glass.png index beb199c..ff698c4 100644 Binary files a/src/main/resources/assets/utamacraft/textures/block/ethereal_glass.png and b/src/main/resources/assets/utamacraft/textures/block/ethereal_glass.png differ diff --git a/src/main/resources/assets/utamacraft/textures/block/ethereal_glass_tinted.png b/src/main/resources/assets/utamacraft/textures/block/ethereal_glass_tinted.png new file mode 100644 index 0000000..32e25b8 Binary files /dev/null and b/src/main/resources/assets/utamacraft/textures/block/ethereal_glass_tinted.png differ diff --git a/src/main/resources/assets/utamacraft/textures/block/tinted_ethereal_glass.png b/src/main/resources/assets/utamacraft/textures/block/tinted_ethereal_glass.png deleted file mode 100644 index 47217c2..0000000 Binary files a/src/main/resources/assets/utamacraft/textures/block/tinted_ethereal_glass.png and /dev/null differ diff --git a/src/main/resources/assets/utamacraft/textures/block/tungsten_block.png b/src/main/resources/assets/utamacraft/textures/block/tungsten_block.png index b7f99f3..15fd0b5 100644 Binary files a/src/main/resources/assets/utamacraft/textures/block/tungsten_block.png and b/src/main/resources/assets/utamacraft/textures/block/tungsten_block.png differ diff --git a/src/main/resources/assets/utamacraft/textures/item/raw_tungsten.png b/src/main/resources/assets/utamacraft/textures/item/raw_tungsten.png deleted file mode 100644 index 0df34a1..0000000 Binary files a/src/main/resources/assets/utamacraft/textures/item/raw_tungsten.png and /dev/null differ diff --git a/src/main/resources/assets/utamacraft/textures/item/tungsten_ingot.png b/src/main/resources/assets/utamacraft/textures/item/tungsten_ingot.png index e4ca3cd..ce862ac 100644 Binary files a/src/main/resources/assets/utamacraft/textures/item/tungsten_ingot.png and b/src/main/resources/assets/utamacraft/textures/item/tungsten_ingot.png differ diff --git a/src/main/resources/assets/utamacraft/textures/item/tungsten_raw.png b/src/main/resources/assets/utamacraft/textures/item/tungsten_raw.png new file mode 100644 index 0000000..a5b5f18 Binary files /dev/null and b/src/main/resources/assets/utamacraft/textures/item/tungsten_raw.png differ diff --git a/src/main/resources/data/utamacraft/loot_tables/blocks/deepslate_tungsten_ore.json b/src/main/resources/data/utamacraft/loot_tables/blocks/deepslate_tungsten_ore.json index 4842e52..f6a0c9f 100644 --- a/src/main/resources/data/utamacraft/loot_tables/blocks/deepslate_tungsten_ore.json +++ b/src/main/resources/data/utamacraft/loot_tables/blocks/deepslate_tungsten_ore.json @@ -48,7 +48,7 @@ "function": "minecraft:explosion_decay" } ], - "name": "utamacraft:raw_tungsten" + "name": "utamacraft:tungsten_raw" } ] } diff --git a/src/main/resources/data/utamacraft/loot_tables/blocks/tinted_ethereal_glass.json b/src/main/resources/data/utamacraft/loot_tables/blocks/ethereal_glass_tinted.json similarity index 75% rename from src/main/resources/data/utamacraft/loot_tables/blocks/tinted_ethereal_glass.json rename to src/main/resources/data/utamacraft/loot_tables/blocks/ethereal_glass_tinted.json index eb370aa..c4caf48 100644 --- a/src/main/resources/data/utamacraft/loot_tables/blocks/tinted_ethereal_glass.json +++ b/src/main/resources/data/utamacraft/loot_tables/blocks/ethereal_glass_tinted.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "utamacraft:tinted_ethereal_glass" + "name": "utamacraft:ethereal_glass_tinted" } ] } diff --git a/src/main/resources/data/utamacraft/loot_tables/blocks/tungsten_ore.json b/src/main/resources/data/utamacraft/loot_tables/blocks/tungsten_ore.json index e9b0e49..2d63ba4 100644 --- a/src/main/resources/data/utamacraft/loot_tables/blocks/tungsten_ore.json +++ b/src/main/resources/data/utamacraft/loot_tables/blocks/tungsten_ore.json @@ -48,7 +48,7 @@ "function": "minecraft:explosion_decay" } ], - "name": "utamacraft:raw_tungsten" + "name": "utamacraft:tungsten_raw" } ] } diff --git a/src/main/resources/data/utamacraft/recipes/tinted_ethereal_glass.json b/src/main/resources/data/utamacraft/recipes/ethereal_glass_tinted.json similarity index 84% rename from src/main/resources/data/utamacraft/recipes/tinted_ethereal_glass.json rename to src/main/resources/data/utamacraft/recipes/ethereal_glass_tinted.json index 265ee6b..022e699 100644 --- a/src/main/resources/data/utamacraft/recipes/tinted_ethereal_glass.json +++ b/src/main/resources/data/utamacraft/recipes/ethereal_glass_tinted.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "utamacraft:tinted_ethereal_glass", + "item": "utamacraft:ethereal_glass_tinted", "count": 8 } } diff --git a/src/main/resources/data/utamacraft/recipes/tungsten_ingot_from_raw_blasting.json b/src/main/resources/data/utamacraft/recipes/tungsten_ingot_from_raw_blasting.json index 82e2e67..71f07eb 100644 --- a/src/main/resources/data/utamacraft/recipes/tungsten_ingot_from_raw_blasting.json +++ b/src/main/resources/data/utamacraft/recipes/tungsten_ingot_from_raw_blasting.json @@ -4,7 +4,7 @@ "experience": 1.0, "group": "tungsten", "ingredient": { - "item": "utamacraft:raw_tungsten" + "item": "utamacraft:tungsten_raw" }, "result": "utamacraft:tungsten_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/utamacraft/recipes/tungsten_ingot_from_raw_smelting.json b/src/main/resources/data/utamacraft/recipes/tungsten_ingot_from_raw_smelting.json index c069c67..d7c9e02 100644 --- a/src/main/resources/data/utamacraft/recipes/tungsten_ingot_from_raw_smelting.json +++ b/src/main/resources/data/utamacraft/recipes/tungsten_ingot_from_raw_smelting.json @@ -4,7 +4,7 @@ "experience": 1.0, "group": "tungsten", "ingredient": { - "item": "utamacraft:raw_tungsten" + "item": "utamacraft:tungsten_raw" }, "result": "utamacraft:tungsten_ingot" } \ No newline at end of file