upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-11 15:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

final fixes

Browse Source 
Added the rest of suggestions,
made one class for glotek and neonite, made variable names more descriptive and removed SideOnly
This commit is contained in:
Jimbno committed 2023-04-24 19:16:33 +02:00
1 parent 1be95d427a
commit bfbdcb07cf
6 files changed
+55 -127
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/team/chisel/Features.java
+33 -21
View File
@@ -23,6 +23,7 @@ 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;
import team.chisel.compat.fmp.ItemBlockChiselTorchPart;
import team.chisel.config.Configurations;
import team.chisel.entity.EntityBallOMoss;
@@ -837,8 +838,8 @@ public enum Features {
@Override
void addBlocks() {
BlockCarvable cubit = (BlockCarvable) new BlockCarvable(Material.rock)
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F)
.setStepSound(Block.soundTypeStone);
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F)
.setStepSound(Block.soundTypeStone);
for (int i = 0; i < 16; i++) {
cubit.carverHelper.addVariation("tile.cubit." + i + ".desc", i, "cubit/" + i);
@@ -861,7 +862,6 @@ public enum Features {
}
},
DIAMOND_BLOCK {
@Override
@@ -1345,8 +1345,12 @@ public enum Features {
}
for (int i = 0; i < 16; i++) {
glotek.carverHelper
.addVariation("tile.glotek." + i + ".desc", i, new SubmapManagerGlotek(String.valueOf(i)));
glotek.carverHelper.addVariation(
"tile.glotek." + i + ".desc",
i,
new SubmapManagerSpecialMaterial(
String.valueOf(i),
SubmapManagerSpecialMaterial.MaterialType.GLOTEK));
}
glotek.carverHelper.registerAll(glotek, "glotek");
@@ -1366,6 +1370,7 @@ public enum Features {
new ItemStack(Items.glowstone_dust, 1));
}
},
GLOWSTONE {
@Override
@@ -1593,13 +1598,13 @@ public enum Features {
@Override
void addBlocks() {
BlockCarvable hempcrete = (BlockCarvable) new BlockCarvable(Material.rock)
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F)
.setStepSound(Block.soundTypeStone);
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F)
.setStepSound(Block.soundTypeStone);
for (int i = 0; i < 16; i++) hempcrete.carverHelper.addVariation(
"tile.hempcrete." + i + ".desc",
i,
"hempCrete/concrete/" + sGNames[i].replaceAll(" ", "").toLowerCase());
"tile.hempcrete." + i + ".desc",
i,
"hempCrete/concrete/" + sGNames[i].replaceAll(" ", "").toLowerCase());
hempcrete.carverHelper.registerAll(hempcrete, "hempcrete");
}
@@ -1607,7 +1612,10 @@ public enum Features {
void addRecipes() {
for (int i = 0; i < 16; i++) {
GameRegistry.addSmelting(new ItemStack(ChiselBlocks.hempcretesand, 1, i), new ItemStack(ChiselBlocks.hempcrete, 1, i), 20F);
GameRegistry.addSmelting(
new ItemStack(ChiselBlocks.hempcretesand, 1, i),
new ItemStack(ChiselBlocks.hempcrete, 1, i),
20F);
GameRegistry.addSmelting(
new ItemStack(ChiselBlocks.hempcretesand, 1, i),
@@ -1623,14 +1631,14 @@ public enum Features {
@Override
void addBlocks() {
BlockCarvableSand hempcretesand = (BlockCarvableSand) new BlockCarvableSand()
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.5F).setResistance(0.5F)
.setStepSound(Block.soundTypeSand);
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.5F).setResistance(0.5F)
.setStepSound(Block.soundTypeSand);
for (int i = 0; i < 16; i++) {
hempcretesand.carverHelper.addVariation(
"tile.hempcretesand." + i + ".desc",
i,
"hempCrete/sand/" + sGNames[i].replaceAll(" ", "").toLowerCase());
"tile.hempcretesand." + i + ".desc",
i,
"hempCrete/sand/" + sGNames[i].replaceAll(" ", "").toLowerCase());
}
hempcretesand.carverHelper.registerAll(hempcretesand, "hempcretesand");
@@ -2467,8 +2475,13 @@ public enum Features {
}
for (int i = 0; i < 16; i++) {
neonite.carverHelper
.addVariation("tile.neonite." + i + ".desc", i, new SubmapManagerNeonite(String.valueOf(i)));
neonite.carverHelper.addVariation(
"tile.neonite." + i + ".desc",
i,
new SubmapManagerSpecialMaterial(
String.valueOf(i),
SubmapManagerSpecialMaterial.MaterialType.NEONITE));
}
neonite.carverHelper.registerAll(neonite, "neonite");
@@ -3354,8 +3367,8 @@ public enum Features {
@Override
void addBlocks() {
BlockCarvable svelstone = (BlockCarvable) new BlockCarvable(Material.rock)
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F)
.setStepSound(Block.soundTypeStone);
.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F)
.setStepSound(Block.soundTypeStone);
for (int i = 0; i < 16; i++) {
svelstone.carverHelper.addVariation("tile.sveltstone." + i + ".desc", i, "sveltstone/" + i);
@@ -3378,7 +3391,6 @@ public enum Features {
}
},
TALLOW("Thaumcraft") {
@Override