Shader crash fix / More blocks / Kiln / Removed (unused) flux

This commit is contained in:
Anuken
2019-01-30 22:51:24 -05:00
parent 43bff5c34d
commit e6a39a8255
20 changed files with 1965 additions and 2001 deletions

View File

@@ -36,10 +36,10 @@ public class Blocks implements ContentList{
//environment
air, part, spawn, deepwater, water, tar, stone, craters, charr, sand, ice, snow,
grass, holostone, rocks, icerocks, cliffs, pine, whiteTree, whiteTreeDead, sporeCluster,
iceSnow, sandWater, duneRocks, stainedRocks,
iceSnow, sandWater, duneRocks, stainedRocks, stainedStone,
//crafting
siliconSmelter, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
siliconSmelter, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
melter, separator, centrifuge, biomatterCompressor, pulverizer, incinerator,
//sandbox
@@ -200,7 +200,6 @@ public class Blocks implements ContentList{
}};
grass = new Floor("grass"){{
hasOres = true;
minimapColor = Color.valueOf("549d5b");
}};
@@ -240,6 +239,11 @@ public class Blocks implements ContentList{
variants = 2;
}};
stainedStone = new Floor("stained-stone"){{
edgeStyle = "blocky";
hasOres = true;
}};
//endregion
//region crafting
@@ -283,6 +287,19 @@ public class Blocks implements ContentList{
consumes.power(0.50f);
}};
kiln = new PowerSmelter("kiln"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 120, Items.graphite, 60, Items.lead, 60));
craftEffect = Fx.smeltsmoke;
output = Items.metaglass;
craftTime = 30f;
size = 2;
hasLiquids = false;
flameColor = Color.valueOf("ffc099");
consumes.items(new ItemStack(Items.lead, 1), new ItemStack(Items.sand, 1));
consumes.power(0.60f);
}};
plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{
requirements(Category.crafting, ItemStack.with(Items.silicon, 160, Items.lead, 230, Items.graphite, 120, Items.titanium, 160));
hasItems = true;
@@ -318,9 +335,6 @@ public class Blocks implements ContentList{
craftTime = 75f;
size = 2;
useFlux = true;
fluxNeeded = 3;
consumes.power(4f);
consumes.items(new ItemStack(Items.titanium, 2), new ItemStack(Items.lead, 4), new ItemStack(Items.silicon, 3), new ItemStack(Items.copper, 3));
}};

View File

@@ -78,7 +78,6 @@ public class Items implements ContentList{
phasefabric = new Item("phase-fabric", Color.valueOf("f4ba6e")){{
type = ItemType.material;
cost = 1.5f;
fluxiness = 1.8f;
radioactivity = 0.6f;
}};
@@ -88,11 +87,10 @@ public class Items implements ContentList{
biomatter = new Item("biomatter", Color.valueOf("648b55")){{
flammability = 1.05f;
fluxiness = 0.6f;
}};
sand = new Item("sand", Color.valueOf("e3d39e")){{
fluxiness = 1f;
}};
blastCompound = new Item("blast-compound", Color.valueOf("ff795e")){{