Updates to textures #38

Merged
BlakeRain merged 7 commits from Jah/utamacraft:main into main 2023-12-17 10:09:46 +00:00
12 changed files with 19 additions and 20 deletions
Showing only changes of commit 8c8a2c423e - Show all commits

View File

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

View File

@ -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)

View File

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

View File

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

View File

@ -1,6 +1,7 @@
{
"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",
@ -21,6 +22,7 @@
"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",

View File

@ -2,6 +2,6 @@
"parent": "block/cube_all",
"render_type": "translucent",
"textures": {
"all": "utamacraft:block/tinted_ethereal_glass"
"all": "utamacraft:block/ethereal_glass_tinted"
}
}

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 898 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "utamacraft:tinted_ethereal_glass"
"name": "utamacraft:ethereal_glass_tinted"
}
]
}

View File

@ -14,7 +14,7 @@
}
},
"result": {
"item": "utamacraft:tinted_ethereal_glass",
"item": "utamacraft:ethereal_glass_tinted",
"count": 8
}
}