From 41d38fc2630362a5fca5d9649e3b09afad5fddbf Mon Sep 17 00:00:00 2001
From: Jimbno <80066034+Jimbno@users.noreply.github.com>
Date: Mon, 24 Apr 2023 20:45:10 +0200
Subject: [PATCH] merge carvable classes

merged glowtek and neonite carvable into one calss
---
 src/main/java/team/chisel/Features.java         |  5 ++---
 ...ableGlotek.java => BlockCarvableGlowie.java} |  6 +++---
 .../team/chisel/block/BlockCarvableNeonite.java | 17 -----------------
 3 files changed, 5 insertions(+), 23 deletions(-)
 rename src/main/java/team/chisel/block/{BlockCarvableGlotek.java => BlockCarvableGlowie.java} (70%)
 delete mode 100644 src/main/java/team/chisel/block/BlockCarvableNeonite.java

diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java
index 6c210ff0..d95ea308 100644
--- a/src/main/java/team/chisel/Features.java
+++ b/src/main/java/team/chisel/Features.java
@@ -20,7 +20,6 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import team.chisel.block.*;
-import team.chisel.block.BlockCarvableNeonite;
 import team.chisel.carving.Carving;
 import team.chisel.client.render.*;
 import team.chisel.client.render.SubmapManagerSpecialMaterial;
@@ -1337,7 +1336,7 @@ public enum Features {
 
         @Override
         void addBlocks() {
-            BlockCarvable glotek = (BlockCarvable) new BlockCarvableGlotek()
+            BlockCarvable glotek = (BlockCarvable) new BlockCarvableGlowie(Material.rock)
                     .setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
 
             if (!Configurations.allowChiselCrossColors) {
@@ -2467,7 +2466,7 @@ public enum Features {
 
         @Override
         void addBlocks() {
-            BlockCarvable neonite = (BlockCarvable) new BlockCarvableNeonite()
+            BlockCarvable neonite = (BlockCarvable) new BlockCarvableGlowie(Material.rock)
                     .setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
 
             if (!Configurations.allowChiselCrossColors) {
diff --git a/src/main/java/team/chisel/block/BlockCarvableGlotek.java b/src/main/java/team/chisel/block/BlockCarvableGlowie.java
similarity index 70%
rename from src/main/java/team/chisel/block/BlockCarvableGlotek.java
rename to src/main/java/team/chisel/block/BlockCarvableGlowie.java
index fb0091f3..a747544f 100644
--- a/src/main/java/team/chisel/block/BlockCarvableGlotek.java
+++ b/src/main/java/team/chisel/block/BlockCarvableGlowie.java
@@ -4,10 +4,10 @@ import net.minecraft.block.material.Material;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.world.IBlockAccess;
 
-public class BlockCarvableGlotek extends BlockCarvable {
+public class BlockCarvableGlowie extends BlockCarvable {
 
-    public BlockCarvableGlotek() {
-        super(Material.rock);
+    public BlockCarvableGlowie(Material material) {
+        super(material);
     }
 
     @Override
diff --git a/src/main/java/team/chisel/block/BlockCarvableNeonite.java b/src/main/java/team/chisel/block/BlockCarvableNeonite.java
deleted file mode 100644
index 6185e7a5..00000000
--- a/src/main/java/team/chisel/block/BlockCarvableNeonite.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package team.chisel.block;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.world.IBlockAccess;
-
-public class BlockCarvableNeonite extends BlockCarvable {
-
-    public BlockCarvableNeonite() {
-        super(Material.rock);
-    }
-
-    @Override
-    public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
-        return false;
-    }
-}