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";
     }
 }

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<Block> ETHEREAL_GLASS =
             registerBlock("ethereal_glass", EtherealGlassBlock::new);
-    public static final RegistryObject<Block> TINTED_ETHEREAL_GLASS =
-            registerBlock("tinted_ethereal_glass", TintedEtherealGlassBlock::new);
+    public static final RegistryObject<Block> ETHEREAL_GLASS_TINTED =
+            registerBlock("ethereal_glass_tinted", EtherealGlassTintedBlock::new);
     public static final RegistryObject<Block> TUNGSTEN_ORE =
             registerBlock("tungsten_ore",
                     () -> new DropExperienceBlock(BlockBehaviour.Properties.of(Material.STONE)

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<Item> TUNGSTEN_INGOT =
             ITEMS.register("tungsten_ingot", ModItems::simpleItem);
-    public static final RegistryObject<Item> RAW_TUNGSTEN =
-            ITEMS.register("raw_tungsten", ModItems::simpleItem);
+    public static final RegistryObject<Item> TUNGSTEN_RAW =
+            ITEMS.register("tungsten_raw", ModItems::simpleItem);
     public static final RegistryObject<Item> FIBER_GLASS =
             ITEMS.register("fiber_glass", ModItems::simpleItem);
     public static final RegistryObject<Item> PCB =

src/main/resources/assets/utamacraft/blockstates/ethereal_glass_tinted.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "utamacraft:block/ethereal_glass_tinted"
+    }
+  }
+}

src/main/resources/assets/utamacraft/blockstates/tinted_ethereal_glass.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "utamacraft:block/tinted_ethereal_glass"
-    }
-  }
-}

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",

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"
   }
 }

src/main/resources/assets/utamacraft/models/item/ethereal_glass_tinted.json

@@ -0,0 +1,3 @@
+{
+  "parent": "utamacraft:block/ethereal_glass_tinted"
+}

src/main/resources/assets/utamacraft/models/item/tinted_ethereal_glass.json

@@ -1,3 +0,0 @@
-{
-  "parent": "utamacraft:block/tinted_ethereal_glass"
-}

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"
   }
 }

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"
             }
           ]
         }

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"
         }
       ]
     }

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"
             }
           ]
         }

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
   }
 }

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"
 }

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"
 }