Blastproof glass (recipes not done yet)

src/main/java/lykrast/glassential/Glassential.java

@@ -66,22 +66,43 @@ public static void makeCreativeTab(RegisterEvent event) {
 		});
 	}
 
+	private static final String GHOSTLY = "tooltip.glassential.ghostly", LIGHT = "tooltip.glassential.light", OBSIDIAN = "tooltip.glassential.obsidian";
+
 	static {
 		makeBlock("glass_redstone", () -> new RedstoneGlassBlock(glassProp()));
-		makeBlock("glass_ghostly", () -> new TooltipGlassBlock(ghostProp(), "tooltip.glassential.ghostly"));
+		makeBlock("glass_ghostly", () -> new TooltipGlassBlock(ghostProp(), GHOSTLY));
 		makeBlock("glass_ethereal", () -> new EtherealGlassBlock(ghostProp(), false));
 		makeBlock("glass_ethereal_reverse", () -> new EtherealGlassBlock(ghostProp(), true));
-		makeBlock("glass_dark_ghostly", () -> new DarkGlassBlock(ghostProp(), "tooltip.glassential.ghostly"));
+		makeBlock("glass_dark_ghostly", () -> new DarkGlassBlock(ghostProp(), GHOSTLY));
 		makeBlock("glass_dark_ethereal", () -> new DarkEtherealGlassBlock(ghostProp(), false));
 		makeBlock("glass_dark_ethereal_reverse", () -> new DarkEtherealGlassBlock(ghostProp(), true));
-		makeBlock("glass_light", () -> new TooltipGlassBlock(glassProp().lightLevel((b) -> 15), "tooltip.glassential.light"));
-		makeBlock("glass_light_ghostly", () -> new TooltipGlassBlock(ghostProp().lightLevel((b) -> 15), "tooltip.glassential.ghostly", "tooltip.glassential.light"));
-		makeBlock("glass_light_ethereal", () -> new EtherealGlassBlock(ghostProp().lightLevel((b) -> 15), false, "tooltip.glassential.light"));
-		makeBlock("glass_light_ethereal_reverse", () -> new EtherealGlassBlock(ghostProp().lightLevel((b) -> 15), true, "tooltip.glassential.light"));
+		makeBlock("glass_light", () -> new TooltipGlassBlock(glassProp().lightLevel((b) -> 15), LIGHT));
+		makeBlock("glass_light_ghostly", () -> new TooltipGlassBlock(ghostProp().lightLevel((b) -> 15), GHOSTLY, LIGHT));
+		makeBlock("glass_light_ethereal", () -> new EtherealGlassBlock(ghostProp().lightLevel((b) -> 15), false, LIGHT));
+		makeBlock("glass_light_ethereal_reverse", () -> new EtherealGlassBlock(ghostProp().lightLevel((b) -> 15), true, LIGHT));
 		makeBlock("glass_magma", () -> new MagmaGlassBlock(glassProp().lightLevel((b) -> 3)));
-		makeBlock("glass_magma_ghostly", () -> new MagmaGlassBlock(ghostProp().lightLevel((b) -> 3), "tooltip.glassential.ghostly"));
+		makeBlock("glass_magma_ghostly", () -> new MagmaGlassBlock(ghostProp().lightLevel((b) -> 3), GHOSTLY));
 		makeBlock("glass_magma_ethereal", () -> new MagmaEtherealGlassBlock(ghostProp().lightLevel((b) -> 3), false));
 		makeBlock("glass_magma_ethereal_reverse", () -> new MagmaEtherealGlassBlock(ghostProp().lightLevel((b) -> 3), true));
+
+		makeBlock("glass_obsidian", () -> new TooltipGlassBlock(obsidian(), OBSIDIAN));
+		makeBlock("glass_obsidian_redstone", () -> new RedstoneGlassBlock(obsidian(), OBSIDIAN));
+		makeBlock("glass_obsidian_ghostly", () -> new TooltipGlassBlock(ghostbsidian(), GHOSTLY));
+		makeBlock("glass_obsidian_ethereal", () -> new EtherealGlassBlock(ghostbsidian(), false, OBSIDIAN));
+		makeBlock("glass_obsidian_ethereal_reverse", () -> new EtherealGlassBlock(ghostbsidian(), true, OBSIDIAN));
+		makeBlock("glass_obsidian_dark", () -> new DarkGlassBlock(obsidian(), null, OBSIDIAN));
+		makeBlock("glass_obsidian_dark_ghostly", () -> new DarkGlassBlock(ghostbsidian(), GHOSTLY, OBSIDIAN));
+		makeBlock("glass_obsidian_dark_ethereal", () -> new DarkEtherealGlassBlock(ghostbsidian(), false, OBSIDIAN));
+		makeBlock("glass_obsidian_dark_ethereal_reverse", () -> new DarkEtherealGlassBlock(ghostbsidian(), true, OBSIDIAN));
+		makeBlock("glass_obsidian_light", () -> new TooltipGlassBlock(obsidian().lightLevel((b) -> 15), LIGHT, OBSIDIAN));
+		makeBlock("glass_obsidian_light_ghostly", () -> new TooltipGlassBlock(ghostbsidian().lightLevel((b) -> 15), GHOSTLY, LIGHT, OBSIDIAN));
+		makeBlock("glass_obsidian_light_ethereal", () -> new EtherealGlassBlock(ghostbsidian().lightLevel((b) -> 15), false, LIGHT, OBSIDIAN));
+		makeBlock("glass_obsidian_light_ethereal_reverse", () -> new EtherealGlassBlock(ghostbsidian().lightLevel((b) -> 15), true, LIGHT, OBSIDIAN));
+		//it's a lil bit of a mess how I ordered the tooltips, hence the extra null
+		makeBlock("glass_obsidian_magma", () -> new MagmaGlassBlock(obsidian().lightLevel((b) -> 3), null, OBSIDIAN));
+		makeBlock("glass_obsidian_magma_ghostly", () -> new MagmaGlassBlock(ghostbsidian().lightLevel((b) -> 3), GHOSTLY, OBSIDIAN));
+		makeBlock("glass_obsidian_magma_ethereal", () -> new MagmaEtherealGlassBlock(ghostbsidian().lightLevel((b) -> 3), false, OBSIDIAN));
+		makeBlock("glass_obsidian_magma_ethereal_reverse", () -> new MagmaEtherealGlassBlock(ghostbsidian().lightLevel((b) -> 3), true, OBSIDIAN));
 	}
 
 	private static RegistryObject<Block> makeBlock(String name, Supplier<Block> block) {
@@ -105,6 +126,14 @@ private static Block.Properties ghostProp() {
 		return glassProp().forceSolidOn().noCollission();
 	}
 
+	private static Block.Properties obsidian() {
+		return glassProp().strength(0.5f, 1200);
+	}
+
+	private static Block.Properties ghostbsidian() {
+		return ghostProp().strength(0.5f, 1200);
+	}
+
 	//Private predicates from Blocks, no need to AT something like that
 	private static Boolean neverAllowSpawn(BlockState state, BlockGetter reader, BlockPos pos, EntityType<?> entity) {
 		return false;

src/main/java/lykrast/glassential/blocks/DarkEtherealGlassBlock.java

@@ -8,7 +8,11 @@
 public class DarkEtherealGlassBlock extends EtherealGlassBlock {
 
 	public DarkEtherealGlassBlock(Block.Properties properties, boolean collidePlayers) {
-		super(properties, collidePlayers, "tooltip.glassential.dark");
+		this(properties, collidePlayers, null);
+	}
+
+	public DarkEtherealGlassBlock(Block.Properties properties, boolean collidePlayers, String third) {
+		super(properties, collidePlayers, "tooltip.glassential.dark", third);
 	}
 
 	@Override

src/main/java/lykrast/glassential/blocks/DarkGlassBlock.java

@@ -17,11 +17,16 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 public class DarkGlassBlock extends GlassBlock {
-	private String extraTooltip;
+	private String extraTooltip, second;
 
 	public DarkGlassBlock(Block.Properties properties, String extraTooltip) {
+		this(properties, extraTooltip, null);
+	}
+
+	public DarkGlassBlock(Block.Properties properties, String extraTooltip, String second) {
 		super(properties);
 		this.extraTooltip = extraTooltip;
+		this.second = second;
 	}
 
 	@Override
@@ -40,5 +45,6 @@ public void appendHoverText(ItemStack stack, @Nullable BlockGetter worldIn, List
 		super.appendHoverText(stack, worldIn, tooltip, flagIn);
 		if (extraTooltip != null) tooltip.add(Component.translatable(extraTooltip).withStyle(ChatFormatting.GRAY));
 		tooltip.add(Component.translatable("tooltip.glassential.dark").withStyle(ChatFormatting.GRAY));
+		if (second != null) tooltip.add(Component.translatable(second).withStyle(ChatFormatting.GRAY));
 	}
 }

src/main/java/lykrast/glassential/blocks/EtherealGlassBlock.java

@@ -14,11 +14,15 @@ public class EtherealGlassBlock extends TooltipGlassBlock {
     private final boolean collidePlayers;
 
     public EtherealGlassBlock(Block.Properties properties, boolean collidePlayers) {
-    	this(properties, collidePlayers, null);
+    	this(properties, collidePlayers, null, null);
     }
-
+    
     public EtherealGlassBlock(Block.Properties properties, boolean collidePlayers, String second) {
-        super(properties, collidePlayers ? "tooltip.glassential.ethereal_reverse" : "tooltip.glassential.ethereal", second);
+    	this(properties, collidePlayers, second, null);
+    }
+
+    public EtherealGlassBlock(Block.Properties properties, boolean collidePlayers, String second, String third) {
+        super(properties, collidePlayers ? "tooltip.glassential.ethereal_reverse" : "tooltip.glassential.ethereal", second, third);
         this.collidePlayers = collidePlayers;
     }
 

src/main/java/lykrast/glassential/blocks/MagmaEtherealGlassBlock.java

@@ -11,7 +11,11 @@
 public class MagmaEtherealGlassBlock extends EtherealGlassBlock {
 
 	public MagmaEtherealGlassBlock(Block.Properties properties, boolean collidePlayers) {
-		super(properties, collidePlayers, "tooltip.glassential.magma");
+		this(properties, collidePlayers, null);
+	}
+
+	public MagmaEtherealGlassBlock(Block.Properties properties, boolean collidePlayers, String third) {
+		super(properties, collidePlayers, "tooltip.glassential.magma", third);
 	}
 
 	@Override

src/main/java/lykrast/glassential/blocks/MagmaGlassBlock.java

@@ -1,35 +1,23 @@
 package lykrast.glassential.blocks;
 
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.GlassBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-public class MagmaGlassBlock extends GlassBlock {
-	private String extraTooltip;
-
+public class MagmaGlassBlock extends TooltipGlassBlock {
 	public MagmaGlassBlock(Block.Properties properties) {
-		this(properties, null);
+		super(properties, "tooltip.glassential.magma");
 	}
-
 	public MagmaGlassBlock(Block.Properties properties, String extraTooltip) {
-		super(properties);
-		this.extraTooltip = extraTooltip;
+		this(properties, extraTooltip, null);
+	}
+
+	public MagmaGlassBlock(Block.Properties properties, String extraTooltip, String third) {
+		super(properties, extraTooltip, "tooltip.glassential.magma", third);
 	}
 
 	@Override
@@ -47,12 +35,4 @@ public void entityInside(BlockState state, Level level, BlockPos pos, Entity ent
 		//that makes it different from cactus but eeeh we'll see
 		if (entity instanceof LivingEntity) entity.hurt(level.damageSources().hotFloor(), 1);
 	}
-
-	@Override
-	@OnlyIn(Dist.CLIENT)
-	public void appendHoverText(ItemStack stack, @Nullable BlockGetter worldIn, List<Component> tooltip, TooltipFlag flagIn) {
-		super.appendHoverText(stack, worldIn, tooltip, flagIn);
-		if (extraTooltip != null) tooltip.add(Component.translatable(extraTooltip).withStyle(ChatFormatting.GRAY));
-		tooltip.add(Component.translatable("tooltip.glassential.magma").withStyle(ChatFormatting.GRAY));
-	}
 }

src/main/java/lykrast/glassential/blocks/RedstoneGlassBlock.java

@@ -18,9 +18,15 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 public class RedstoneGlassBlock extends GlassBlock {
+	private String extraTooltip;
 
 	public RedstoneGlassBlock(Block.Properties settings) {
+		this(settings, null);
+	}
+
+	public RedstoneGlassBlock(Block.Properties settings, String extraTooltip) {
 		super(settings);
+		this.extraTooltip = extraTooltip;
 	}
 
 	@Override
@@ -38,5 +44,6 @@ public int getSignal(BlockState state, BlockGetter world, BlockPos pos, Directio
 	public void appendHoverText(ItemStack stack, @Nullable BlockGetter worldIn, List<Component> tooltip, TooltipFlag flagIn) {
 		super.appendHoverText(stack, worldIn, tooltip, flagIn);
 		tooltip.add(Component.translatable("tooltip.glassential.redstone").withStyle(ChatFormatting.GRAY));
+		if (extraTooltip != null) tooltip.add(Component.translatable(extraTooltip).withStyle(ChatFormatting.GRAY));
 	}
 }

src/main/java/lykrast/glassential/blocks/TooltipGlassBlock.java

@@ -15,25 +15,30 @@
 
 public class TooltipGlassBlock extends GlassBlock {
 	//Used for Light and Ghostly glass that don't need their own classes for their properties
-	private String tooltip;
-	private String second;
+	private String tooltip, second, third;
 
 	public TooltipGlassBlock(Properties properties, String tooltip) {
-		this(properties, tooltip, null);
+		this(properties, tooltip, null, null);
 	}
-
+	
 	public TooltipGlassBlock(Properties properties, String tooltip, String second) {
+		this(properties, tooltip, second, null);
+	}
+
+	public TooltipGlassBlock(Properties properties, String tooltip, String second, String third) {
 		super(properties);
 		this.tooltip = tooltip;
 		this.second = second;
+		this.third = third;
 	}
 
 	@Override
 	@OnlyIn(Dist.CLIENT)
 	public void appendHoverText(ItemStack stack, @Nullable BlockGetter worldIn, List<Component> tooltip, TooltipFlag flagIn) {
 		super.appendHoverText(stack, worldIn, tooltip, flagIn);
-		tooltip.add(Component.translatable(this.tooltip).withStyle(ChatFormatting.GRAY));
+		if (this.tooltip != null) tooltip.add(Component.translatable(this.tooltip).withStyle(ChatFormatting.GRAY));
 		if (second != null) tooltip.add(Component.translatable(second).withStyle(ChatFormatting.GRAY));
+		if (third != null) tooltip.add(Component.translatable(third).withStyle(ChatFormatting.GRAY));
 	}
 
 }

src/main/resources/assets/glassential/blockstates/glass_obsidian.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_dark.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_dark" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_dark_ethereal.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_dark_ethereal" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_dark_ethereal_reverse.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_dark_ethereal_reverse" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_dark_ghostly.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_dark_ghostly" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_ethereal.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_ethereal" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_ethereal_reverse.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_ethereal_reverse" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_ghostly.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_ghostly" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_light.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_light" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_light_ethereal.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_light_ethereal" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_light_ethereal_reverse.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_light_ethereal_reverse" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_light_ghostly.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_light_ghostly" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_magma.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_magma" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_magma_ethereal.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_magma_ethereal" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_magma_ethereal_reverse.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_magma_ethereal_reverse" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_magma_ghostly.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_magma_ghostly" }
+	}
+}

src/main/resources/assets/glassential/blockstates/glass_obsidian_redstone.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "glassential:block/glass_obsidian_redstone" }
+	}
+}