Skip to content

Commit 7a62cd4

Browse files
HoustonrussHoustonruss
committed
Preliminary stuff for 2.x.x 2
Firestone texture thing
1 parent 68f8cf4 commit 7a62cd4

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

‎src/main/java/gregtech/api/enums/Materials.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
204204
public static Materials EnderiumBase = new Materials( 380, TextureSet.SET_DULL , 16.0F, 768, 4, 1|2 |64|128 , 72, 119, 153, 0, "EnderiumBase" , "Enderium Base" , 0, 0, 3600, 3600, true, false, 1, 1, 1, Dyes.dyeGreen , 1, Arrays.asList(new MaterialStack(Tin, 2), new MaterialStack(Silver, 1), new MaterialStack(Platinum, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))).disableAutoGeneratedBlastFurnaceRecipes();
205205
public static Materials Energized = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "Energized" , "Energized" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL );
206206
public static Materials FierySteel = new Materials( 346, TextureSet.SET_FIERY , 8.0F, 256, 3, 1|2 |64|128 , 64, 0, 0, 0, "FierySteel" , "Fiery Steel" , 5, 2048, 1811, 1800, true, false, 1, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 3), new TC_AspectStack(TC_Aspects.IGNIS, 3), new TC_AspectStack(TC_Aspects.CORPUS, 3))).disableAutoGeneratedBlastFurnaceRecipes();
207-
public static Materials Firestone = new Materials( 347, TextureSet.SET_QUARTZ , 6.0F, 1280, 3, 1 |4|8 |64 , 200, 20, 0, 0, "Firestone" , "Firestone" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed );
207+
public static Materials Firestone = new Materials( 347, TextureSet.SET_FIERY , 6.0F, 1280, 3, 1 |4|8 |64 , 200, 20, 0, 0, "Firestone" , "Firestone" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed );
208208
public static Materials Fluorite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Fluorite" , "Fluorite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen );
209209
public static Materials FoolsRuby = new Materials( 512, TextureSet.SET_RUBY , 1.0F, 0, 2, 1 |4|8 , 255, 100, 100, 127, "FoolsRuby" , "Ruby" , 0, 0, -1, 0, false, true, 3, 1, 1, Dyes.dyeRed , 1, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 4)), Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 2), new TC_AspectStack(TC_Aspects.VITREUS, 2)));
210210
public static Materials Glowstone = new Materials( 811, TextureSet.SET_SHINY , 1.0F, 0, 1, 1 |16 , 255, 255, 0, 0, "Glowstone" , "Glowstone" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.LUX, 2), new TC_AspectStack(TC_Aspects.SENSUS, 1)));

‎src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void run() {
9090
new GT_Worldgen_GT_Ore_SmallPieces("ore.small.bismuth", true, 80, 120, 8, false, true, false, true, true, false, Materials.Bismuth);
9191
new GT_Worldgen_GT_Ore_SmallPieces("ore.small.firestone", true, 5, 15, 8, false, true, false, Materials.Firestone);
9292
//Rare Nether Ores
93-
new GT_Worldgen_GT_Ore_SmallPieces("ore.small.netherstar", true, 105, 115, 4, false, true, false, Materials.NetherStar);
93+
new GT_Worldgen_GT_Ore_SmallPieces("ore.small.netherstar", true, 101, 115, 6, false, true, false, Materials.NetherStar);
9494
//TwF Ores
9595
new GT_Worldgen_GT_Ore_SmallPieces("ore.small.amethyst", true, 5, 35, 4, false, false, false, false, true, true, Materials.Amethyst);
9696
new GT_Worldgen_GT_Ore_SmallPieces("ore.small.lapis", true, 3, 35, 8, true, false, false, false, true, true, Materials.Lapis);
@@ -129,8 +129,11 @@ public void run() {
129129
new GT_Worldgen_GT_Ore_Layer("ore.mix.perditioordo", true, 5, 35, 60, 2, 16, false, false, false, Materials.InfusedEntropy, Materials.InfusedOrder, Materials.Amber, Materials.Cinnabar);
130130

131131
//Nether-Only Veins
132-
new GT_Worldgen_GT_Ore_Layer("ore.mix.titanium", true, 64, 120, 50, 6, 24, false, true, false, Materials.Ilmenite, Materials.Rutile, Materials.Ilmenite, Materials.Ilmenite);
133-
new GT_Worldgen_GT_Ore_Layer("ore.mix.nuclear", true, 5, 60, 50, 8, 16, false, true, false, Materials.Pitchblende, Materials.Thorium, Materials.Pitchblende, Materials.Uraninite);
132+
new GT_Worldgen_GT_Ore_Layer("ore.mix.titanium", true, 70, 90, 50, 6, 24, false, true, false, Materials.Ilmenite, Materials.Rutile, Materials.Ilmenite, Materials.Ilmenite);
133+
new GT_Worldgen_GT_Ore_Layer("ore.mix.nuclear", true, 5, 50, 50, 7, 16, false, true, false, Materials.Pitchblende, Materials.Thorium, Materials.Pitchblende, Materials.Uraninite);
134+
new GT_Worldgen_GT_Ore_Layer("ore.mix.firestone", true, 5, 30, 50, 3, 1, false, true, false, Materials.Firestone, Materials.Firestone, Materials.Firestone, Materials.Firestone);
135+
new GT_Worldgen_GT_Ore_Layer("ore.mix.infusedgold",true, 5, 100, 50, 2, 5, false, true, false, Materials.InfusedGold, Materials.InfusedGold, Materials.InfusedGold, Materials.InfusedGold);
136+
new GT_Worldgen_GT_Ore_Layer("ore.mix.netherstar",true, 116, 120, 2, 1, 2, false, true, false, Materials.NetherStar, Materials.NetherStar, Materials.NetherStar, Materials.NetherStar);
134137
//Old nether veins.
135138
// new GT_Worldgen_GT_Ore_Layer("ore.mix.saltpeterelectrotine", true, 5, 45, 55, 5, 16, false, true, false, Materials.Electrotine, Materials.Saltpeter, Materials.Saltpeter, Materials.Sphalerite);
136139
// new GT_Worldgen_GT_Ore_Layer("ore.mix.beryllium", true, 5, 30, 30, 2, 16, false, true, false, Materials.Beryllium, Materials.Beryllium, Materials.Emerald, Materials.Thorium);

0 commit comments

Comments
 (0)