Browse Source

PFAA Material Data for Clay Balls added

Gregorius Techneticies 3 months ago
parent
commit
3d36966f54
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 1
- 0
src/main/java/gregapi/data/IL.java View File

@@ -133,6 +133,7 @@ public enum IL implements IItemContainer {
133 133
 	HaC_Cinnamon, HaC_Royal_Jelly,
134 134
 	ABYSSAL_Crate, ABYSSAL_Lava,
135 135
 	ATUM_Scarab, ATUM_Limestone, ATUM_Limecobble,
136
+	PFAA_Sands,
136 137
 	RH_Sand_Magnetite, RH_Sand_Olivine, RH_Sand_Coral, RH_Sand_Gypsum,
137 138
 	TROPIC_Chest, TROPIC_Bamboo, TROPIC_Stick, TROPIC_Log_Palm, TROPIC_Log_Mahogany, TROPIC_Sand_Coral, TROPIC_Sand_Foamy, TROPIC_Sand_Black, TROPIC_Sand_Mineral, TROPIC_Sand_Pure,
138 139
 	TROPIC_Sapling_Palm, TROPIC_Sapling_Mahogany, TROPIC_Sapling_Grapefruit, TROPIC_Sapling_Lemon, TROPIC_Sapling_Lime, TROPIC_Sapling_Orange,

+ 6
- 6
src/main/java/gregapi/data/MT.java View File

@@ -918,7 +918,7 @@ public class MT {
918 918
 	
919 919
 	
920 920
 	MgCl2                   = oredustelec   ( 8018, "Magnesium Chloride"    , SET_CUBE              , 235, 235, 250, 255, MELTING, MOLTEN, INGOTS)                                                                                                                  .uumMcfg( 0, Mg             , 1*U, Cl               , 2*U)                                                                                                  .aspects(TC.FAMES, 1).heat( 987, 1685), // Can be electrolyzed for real
921
-	MgCO3                   = oredustelec   ( 8016, "Magnesium Carbonate"   , SET_DULL              , 240, 230, 230, 255, MELTING, MOLTEN, INGOTS)                                                                                                                  .uumMcfg( 0, Mg             , 1*U, CO3              , 4*U)                                                                                                  .heat( 623, 3000),
921
+	MgCO3                   = oredustelec   ( 8016, "Magnesium Carbonate"   , SET_DULL              , 240, 230, 230, 255, MELTING, MOLTEN, INGOTS, "Magnesite")                                                                                                     .uumMcfg( 0, Mg             , 1*U, CO3              , 4*U)                                                                                                  .heat( 623, 3000),
922 922
 	
923 923
 	
924 924
 	CaCl2                   = oredustelec   ( 8028, "Calcium Chloride"      , SET_CUBE              , 235, 235, 250, 255, MELTING, MOLTEN, INGOTS)                                                                                                                  .uumMcfg( 0, Ca             , 1*U, Cl               , 2*U)                                                                                                  .aspects(TC.FAMES, 1).heat(1048, 2208), // Can be electrolyzed for real
@@ -1010,7 +1010,7 @@ public class MT {
1010 1010
 	BioFuel                 = lqudflam      ( 9841, "Bio Fuel"                                      , 200, 128,   0, 255, TICKS_PER_SMELT*360)                                                                                                                                                                                                                                                                                  .heat( 100,  400).aspects(TC.HERBA, 1, TC.POTENTIA, 1).setLocal("Bio Diesel"),
1011 1011
 	Ethanol                 = lqudflam      ( 9842, "Ethanol"                                       , 255, 128,   0, 255, TICKS_PER_SMELT*360)                                                                                                                                                                                                                                                                                  .heat( 100,  400).aspects(TC.HERBA, 1, TC.POTENTIA, 1),
1012 1012
 	Oil                     = lqudflam      ( 9850, "Oil"                                           ,  10,  10,  10, 255, TICKS_PER_SMELT* 60)                                                                                                                                                                                                                                                                                  .heat( 100,  400).aspects(TC.MORTUUS, 2, TC.LUX, 1),
1013
-	Oilsands                = oredust       ( 9851, "Oilsands"              , SET_SAND              ,  10,  10,  10, 255, TICKS_PER_SMELT* 30)                                                                                                                                                                                                                                                                                  .heat( 100,  400).aspects(TC.MORTUUS, 2, TC.LUX, 1),
1013
+	Oilsands                = oredust       ( 9851, "Oil Sands"             , SET_SAND              ,  10,  10,  10, 255, TICKS_PER_SMELT* 30, "Oilsands")                                                                                                                                                                                                                                                                      .heat( 100,  400).aspects(TC.MORTUUS, 2, TC.LUX, 1),
1014 1014
 	CrudeOil                = oredust       ( 9852, "Crude Oil"             , SET_DULL              ,  10,  10,  10, 255, TICKS_PER_SMELT* 60)                                                                                                                                                                                                                                                                                  .heat( 100,  400).aspects(TC.MORTUUS, 2, TC.LUX, 1),
1015 1015
 	Fuel                    = lqudexpl      ( 9860, "Fuel"                                          , 255, 255,   0, 255, TICKS_PER_SMELT*360, "FuelOil")                                                                                                                                                                                                                                                                       .heat( 100,  400).aspects(TC.MORTUUS, 1, TC.POTENTIA, 1).setLocal("Fuel Oil"),
1016 1016
 	NitroFuel               = lqudexpl      ( 9861, "Nitro-Fuel"                                    , 200, 255,   0, 255, TICKS_PER_SMELT*360)                                                                                                                      .setMcfg( 0, Glyceryl       , 1*U, Fuel             , 4*U)                                                                                                  .heat( 100,  400).aspects(TC.MORTUUS, 1, TC.POTENTIA, 2),
@@ -1098,7 +1098,7 @@ public class MT {
1098 1098
 	Kaolinite               = clay          ( 9167, "Kaolinite"                                     , 245, 235, 235, Ca )                                                                                                                                                                                                                                                                                                       .setLocal("Kaolinite Clay"),    // Al2Si2O5(OH)4
1099 1099
 	
1100 1100
 	
1101
-	Porcelain               = mixdust       ( 8273, "Porcelain"             , SET_ROUGH             , 235, 235, 245, 255, PLATES, BRITTLE, MORTAR)                                                                                                                  .uumMcfg( 0, Ceramic        , 2*U, SiO2             , 1*U, PotassiumFeldspar, 1*U)                                                                          .heat(1800).setCompressing(null, 0).setBending(null, 0).setForging(null, 0).setSmashing(null, 0),
1101
+	Porcelain               = mixdust       ( 8273, "Porcelain"             , SET_FINE              , 235, 235, 245, 255, PLATES, BRITTLE, MORTAR)                                                                                                                  .uumMcfg( 0, Ceramic        , 2*U, SiO2             , 1*U, PotassiumFeldspar, 1*U)                                                                          .heat(1800).setCompressing(null, 0).setBending(null, 0).setForging(null, 0).setSmashing(null, 0),
1102 1102
 	
1103 1103
 	
1104 1104
 	Graphite                = oredustdcmp   ( 9174, "Graphite"              , SET_DULL              , 128, 128, 128, 255, BLACKLISTED_SMELTER, BRITTLE, MORTAR, STICKS)                                                                                             .uumMcfg( 0, C              , 1*U)                                                                                                                          .qual(1, 5.0, 32, 2).setSmelting(C, U2).setBurning(Ash, U4).heat(1700, C.mBoilingPoint),
@@ -1491,7 +1491,7 @@ public class MT {
1491 1491
 	Bluestone               = stone         ( 9185, "Bluestone"                                     ,  52,  52, 252, 255)                                                                                                                                                                                                                                                                                                       .aspects(TC.TERRA       , 1),
1492 1492
 	Epidote                 = stone         ( 9182, "Epidote"                                       , 128, 128, 128, 255)                                                                                                                                                                                                                                                                                                       .aspects(TC.TERRA       , 1),
1493 1493
 	
1494
-	Oilshale                = oredust       ( 9853, "Oilshale"              , SET_STONE             ,  50,  50,  60, 255, FLAMMABLE, TICKS_PER_SMELT* 2).setBurning(Stone, U2)                                                                                                                                                                                                                                                  .heat( 500, 1000).aspects(TC.MORTUUS, 2, TC.LUX, 1),
1494
+	Oilshale                = oredust       ( 9853, "Oil Shale"             , SET_STONE             ,  50,  50,  60, 255, FLAMMABLE, TICKS_PER_SMELT* 2, "Oilshale").setBurning(Stone, U2)                                                                                                                                                                                                                                      .heat( 500, 1000).aspects(TC.MORTUUS, 2, TC.LUX, 1),
1495 1495
 	
1496 1496
 	
1497 1497
 	
@@ -3233,7 +3233,7 @@ public class MT {
3233 3233
 		Uraninite               = oredustelec( 9134, "Uraninite"                 , SET_RAD       ,  35,  35,  35, 255, BLACKLISTED_SMELTER                                                            ).setSmelting(U_238,   U3).setMcfg( 1, U_238          , 1*U, O                , 2*U)                                                                                                ,
3234 3234
 		Magnetite               = oredustelec( 9122, "Magnetite"                 , SET_METALLIC  ,  30,  30,  30, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .uumMcfg( 0, Fe             , 3*U, O                , 4*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3235 3235
 		BasalticMineralSand     = oredustcent( 9003, "Basaltic Mineral Sand"     , SET_METALLIC  ,  40,  50,  40, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 1, Magnetite      , 1*U, Gabbro           , 1*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3236
-		GraniticMineralSand     = oredustcent( 9004, "Granitic Mineral Sand"     , SET_METALLIC  ,  40,  60,  60, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 1, Magnetite      , 1*U, Granite          , 1*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3236
+		GraniticMineralSand     = oredustcent( 9004, "Granitic Mineral Sand"     , SET_METALLIC  ,  40,  60,  60, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 1, Magnetite      , 1*U, GraniteBlack     , 1*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3237 3237
 		
3238 3238
 		Cinnabar                = oredustcent( 9114, "Cinnabar"                  , SET_REDSTONE  , 150,   0,   0, 255, G_GEM_ORES_TRANSPARENT, MORTAR, BRITTLE, FURNACE, PULVERIZING_CINNABAR, CRYSTAL).setSmelting(Hg   ,   U3).uumMcfg( 0, Hg             , 1*U, S                , 1*U)                                                                                                ,
3239 3239
 		Molybdenite             = oredustdcmp( 9123, "Molybdenite"               , SET_METALLIC  ,  25,  25,  25, 255, G_GEM_ORES, MORTAR, BLACKLISTED_SMELTER                                        ).setSmelting(Mo   ,   U4).uumMcfg( 0, Mo             , 1*U, S                , 2*U)                                                                                                ,
@@ -3267,7 +3267,7 @@ public class MT {
3267 3267
 		Pollucite               = oredustelec( 9147, "Pollucite"                 , SET_DULL      , 240, 210, 210, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          , 5*U, Cs               , 2*U, SiO2             ,12*U, H2O              , 6*U, O                , 1*U)                        , // Cs2Al2Si4O12 2H2O (also a source of Rb)
3268 3268
 		
3269 3269
 		BrownLimonite           = oredustdcmp( 9106, "Brown Limonite"            , SET_METALLIC  , 200, 100,   0, 255, MORTAR, MELTING, MAGNETIC_PASSIVE                                              ).setSmelting(Fe2O3,   U2).setMcfg( 0, Fe             , 1*U, H                , 1*U, O                , 2*U)                                                                        .qual(0).heat(1523), // FeO(OH)
3270
-		YellowLimonite          = oredustdcmp( 9137, "Yellow Limonite"           , SET_METALLIC  , 200, 200,   0, 255, MORTAR, MELTING, MAGNETIC_PASSIVE                                              ).setSmelting(Fe2O3,   U2).setMcfg( 0, Fe             , 1*U, H                , 1*U, O                , 2*U)                                                                        .qual(0).heat(1523), // FeO(OH) + a bit Ni and Co
3270
+		YellowLimonite          = oredustdcmp( 9137, "Yellow Limonite"           , SET_METALLIC  , 200, 200,   0, 255, MORTAR, MELTING, MAGNETIC_PASSIVE, "BogIron"                                   ).setSmelting(Fe2O3,   U2).setMcfg( 0, Fe             , 1*U, H                , 1*U, O                , 2*U)                                                                        .qual(0).heat(1523), // FeO(OH) + a bit Ni and Co
3271 3271
 		
3272 3272
 		Ilmenite                = oredustdcmp( 9120, "Ilmenite"                  , SET_METALLIC  ,  70,  55,  50, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE, "Illmenite", "TitaniumIron"         )                         .uumMcfg( 0, Fe             , 1*U, Ti               , 1*U, O                , 3*U)                                                                        .qual(2),
3273 3273
 		Bauxite                 = oredustdcmp( 9105, "Bauxite"                   , SET_DULL      , 200, 100,   0, 255, MORTAR, BLACKLISTED_SMELTER, APPROXIMATE                                       )                         .setMcfg( 0, TiO2           , 1*U, Ilmenite         , 2*U, Al2O3            , 2*U)                                                                        .qual(2).heat(2800),

+ 19
- 2
src/main/java/gregapi/load/LoaderItemData.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -811,7 +811,24 @@ public class LoaderItemData implements Runnable {
811 811
 		
812 812
 		for (byte i = 0; i < 16; i++) OM.reg(OP.dyeMixable.mNameInternal + DYE_OREDICTS_POST[i], ST.make(Items.dye, 1, i));
813 813
 		
814
-		OM.reg(OP.stone, MT.GraniteBlack                        , ST.make(MD.PFAA, "strongStone", 1,  3)); // actually Gray
814
+		if (MD.PFAA.mLoaded) {
815
+			OM.reg(OD.itemClay              , ST.make(MD.PFAA, "earthyClump", 1, 45));
816
+			OM.reg(OD.itemClay              , ST.make(MD.PFAA, "earthyClump", 1, 47));
817
+			OM.reg(OD.itemClay              , ST.make(MD.PFAA, "earthyClump", 1, 48));
818
+			OM.reg(OD.itemClay              , ST.make(MD.PFAA, "earthyClump", 1, 49));
819
+			
820
+			OM.reg(OP.stone, MT.GraniteBlack, ST.make(MD.PFAA, "strongStone", 1,  3)); // actually Gray
821
+			
822
+			OM.data(MD.PFAA, "earthyClump", 1,  37, MT.OREMATS.YellowLimonite, U);
823
+			OM.data(MD.PFAA, "earthyClump", 1,  45, MT.ClayBrown             , U);
824
+			OM.data(MD.PFAA, "earthyClump", 1,  46, MT.OREMATS.Bauxite       , U);
825
+			OM.data(MD.PFAA, "earthyClump", 1,  47, MT.Bentonite             , U);
826
+			OM.data(MD.PFAA, "earthyClump", 1,  48, MT.Palygorskite          , U);
827
+			OM.data(MD.PFAA, "earthyClump", 1,  49, MT.Kaolinite             , U);
828
+			OM.data(MD.PFAA, "earthyClump", 1,  50, MT.OREMATS.BrownLimonite , U);
829
+			OM.data(MD.PFAA, "earthyClump", 1,  51, MT.OREMATS.YellowLimonite, U);
830
+			OM.data(MD.PFAA, "earthyClump", 1,  52, MT.OREMATS.Vermiculite   , U);
831
+		}
815 832
 		
816 833
 		if (MD.UB.mLoaded) {
817 834
 			for (String tName : new String [] {"sedimentaryStone"}) {

+ 3
- 0
src/main/java/gregapi/load/LoaderItemList.java View File

@@ -828,6 +828,9 @@ public class LoaderItemList implements Runnable {
828 828
 		if (IL.TF_Lamp_of_Cinders.exists()) IL.TF_Lamp_of_Cinders.item().setContainerItem(IL.TF_Lamp_of_Cinders.getItem());
829 829
 		
830 830
 		
831
+		IL.PFAA_Sands                           .set(ST.make(MD.PFAA, "weakOreSand"                         , 1, 0));
832
+		
833
+		
831 834
 		IL.RH_Sand_Magnetite                    .set(ST.make(MD.RH, "globbypotato_rockhounding_beachSands"  , 1, 0), new OreDictItemData(MT.OREMATS.GraniticMineralSand, U));
832 835
 		IL.RH_Sand_Olivine                      .set(ST.make(MD.RH, "globbypotato_rockhounding_beachSands"  , 1, 1), new OreDictItemData(MT.Olivine, U));
833 836
 		IL.RH_Sand_Coral                        .set(ST.make(MD.RH, "globbypotato_rockhounding_beachSands"  , 1, 2), new OreDictItemData(MT.Sand, U));

+ 6
- 0
src/main/java/gregapi/load/LoaderUnificationTargets.java View File

@@ -36,6 +36,12 @@ public class LoaderUnificationTargets implements Runnable {
36 36
 	@Override
37 37
 	public void run() {
38 38
 		// Because most Mods (and vanilla MC) are not OreDict Compatible and need to be set as Target manually.
39
+		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.Oilshale               , ST.make(MD.PFAA, "crudeLump", 1, 31));
40
+		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.Coal                   , ST.make(MD.PFAA, "crudeLump", 1, 32));
41
+		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.Lignite                , ST.make(MD.PFAA, "crudeLump", 1, 33));
42
+		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.Anthracite             , ST.make(MD.PFAA, "crudeLump", 1, 34));
43
+		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.CoalCoke               , ST.make(MD.PFAA, "crudeLump", 1, 35));
44
+		OreDictManager.INSTANCE.setTarget(OP.ingot          , MT.Peat                   , ST.make(MD.PFAA, "earthyClump", 1, 36));
39 45
 		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.Bone                   , ST.make(MD.Fossil, "fossil", 1, 0));
40 46
 		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.Amber                  , ST.make(MD.Fossil, "amberOre", 1, 0));
41 47
 		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.Amber                  , ST.make(MD.Fossil, "amber", 1, 0));

+ 25
- 26
src/main/java/gregtech/GT6_Main.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -23,7 +23,6 @@ import static gregapi.data.CS.*;
23 23
 import static gregapi.util.CR.*;
24 24
 
25 25
 import java.util.ArrayList;
26
-import java.util.Arrays;
27 26
 import java.util.Collections;
28 27
 import java.util.List;
29 28
 import java.util.Map.Entry;
@@ -636,33 +635,33 @@ public class GT6_Main extends Abstract_Mod {
636 635
 			ORD.println("*");
637 636
 			ORD.println("TagData:");
638 637
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
639
-
638
+			
640 639
 			for (TagData tData : TagData.TAGS) ORD.println(tData.mName);
641
-
640
+			
642 641
 			ORD.println("*");
643 642
 			ORD.println("ItemRegistry:");
644 643
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
645
-
646
-			Object[] tList = Item.itemRegistry.getKeys().toArray();
647
-
648
-			Arrays.sort(tList);
649
-			for (Object tItemName : tList) ORD.println(tItemName);
650
-
644
+			
645
+			List<String> tList = UT.Code.getWithoutNulls((String[])Item.itemRegistry.getKeys().toArray());
646
+			
647
+			Collections.sort(tList);
648
+			for (String tItemName : tList) ORD.println(tItemName);
649
+			
651 650
 			ORD.println("*");
652 651
 			ORD.println("OreDictionary:");
653 652
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
654
-
655
-			tList = OreDictionary.getOreNames();
656
-			Arrays.sort(tList);
657
-			for (Object tOreName : tList) {
653
+			
654
+			tList = UT.Code.getWithoutNulls(OreDictionary.getOreNames());
655
+			Collections.sort(tList);
656
+			for (String tOreName : tList) {
658 657
 				int tAmount = OreDictionary.getOres(tOreName.toString()).size();
659 658
 				if (tAmount > 0) ORD.println((tAmount<10?" ":"") + tAmount + "x " + tOreName);
660 659
 			}
661
-
660
+			
662 661
 			ORD.println("*");
663 662
 			ORD.println("Materials:");
664 663
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
665
-
664
+			
666 665
 			for (int i = 0; i < OreDictMaterial.MATERIAL_ARRAY.length; i++) {
667 666
 				OreDictMaterial tMaterial = OreDictMaterial.MATERIAL_ARRAY[i];
668 667
 				if (tMaterial == null) {
@@ -677,31 +676,31 @@ public class GT6_Main extends Abstract_Mod {
677 676
 					}
678 677
 				}
679 678
 			}
680
-
679
+			
681 680
 			ORD.println("*");
682 681
 			ORD.println("Fluids:");
683 682
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
684
-
685
-			tList = FluidRegistry.getRegisteredFluids().keySet().toArray(ZL_STRING);
686
-			Arrays.sort(tList);
687
-			for (Object tFluidName : tList) ORD.println(tFluidName);
688
-
683
+			
684
+			tList = UT.Code.getWithoutNulls(FluidRegistry.getRegisteredFluids().keySet().toArray(ZL_STRING));
685
+			Collections.sort(tList);
686
+			for (String tFluidName : tList) ORD.println(tFluidName);
687
+			
689 688
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
690 689
 			ORD.println("Biomes:");
691 690
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
692
-
691
+			
693 692
 			for (int i = 0; i < BiomeGenBase.getBiomeGenArray().length; i++) {
694 693
 				if (BiomeGenBase.getBiomeGenArray()[i] != null) ORD.println(BiomeGenBase.getBiomeGenArray()[i].biomeID + " = " + BiomeGenBase.getBiomeGenArray()[i].biomeName);
695 694
 			}
696
-
695
+			
697 696
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
698 697
 			ORD.println("Enchantments:");
699 698
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
700
-
699
+			
701 700
 			for (int i = 0; i < Enchantment.enchantmentsList.length; i++) {
702 701
 				if (Enchantment.enchantmentsList[i] != null) ORD.println(i + " = " + Enchantment.enchantmentsList[i].getName());
703 702
 			}
704
-
703
+			
705 704
 			ORD.println("*"); ORD.println("*"); ORD.println("*");
706 705
 			ORD.println("END GregTech-Debug");
707 706
 			ORD.println("*"); ORD.println("*"); ORD.println("*");

+ 2
- 2
src/main/java/gregtech/loaders/c/Loader_Recipes_Ores.java View File

@@ -234,8 +234,8 @@ public class Loader_Recipes_Ores implements Runnable {
234 234
 		RM.Sifting          .addRecipe1(T, 16,  200, new long[] {9900, 500, 500}     , ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite          , 1), rockGt.mat(MT.Stone, 1), nugget.mat(MT.Au, 1));
235 235
 		RM.MagneticSeparator.addRecipe1(T, 16,  144, new long[] {9900, 500, 500, 500}, ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite          , 1), rockGt.mat(MT.Stone, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
236 236
 		RM.Centrifuge       .addRecipe1(T, 16,  256, new long[] {9000, 1000}         , ST.make(BlocksGT.Sands, 1, 0), dust.mat(MT.OREMATS.Magnetite          , 1), dust.mat(MT.V2O5, 1));
237
-		RM.Sifting          .addRecipe1(T, 16,  200, new long[] {9900, 500, 500}     , ST.make(BlocksGT.Sands, 1, 1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1));
238
-		RM.MagneticSeparator.addRecipe1(T, 16,  144, new long[] {9900, 500, 500, 500}, ST.make(BlocksGT.Sands, 1, 1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
237
+		RM.Sifting          .addRecipe1(T, 16,  200, new long[] {9900, 500, 500}     , ST.make(BlocksGT.Sands, 1, 1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Gabbro, 1), nugget.mat(MT.Au, 1));
238
+		RM.MagneticSeparator.addRecipe1(T, 16,  144, new long[] {9900, 500, 500, 500}, ST.make(BlocksGT.Sands, 1, 1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Gabbro, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
239 239
 		RM.Centrifuge       .addRecipe1(T, 16,  256, new long[] {9000, 1000}         , ST.make(BlocksGT.Sands, 1, 1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), dust.mat(MT.V2O5, 1));
240 240
 		RM.Sifting          .addRecipe1(T, 16,  200, new long[] {9900, 500, 500}     , ST.make(BlocksGT.Sands, 1, 2), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1));
241 241
 		RM.MagneticSeparator.addRecipe1(T, 16,  144, new long[] {9900, 500, 500, 500}, ST.make(BlocksGT.Sands, 1, 2), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));

+ 14
- 14
src/main/java/gregtech/loaders/c/Loader_Recipes_Other.java View File

@@ -615,21 +615,21 @@ public class Loader_Recipes_Other implements Runnable {
615 615
 			RM.CrystallisationCrucible.addRecipe1(T, 16, 648000, OM.dust(MT.NikolineAlloy       ), FL.array(FL.mul(tFluid, 9), MT.NikolineAlloy .liquid(35*U , T)), NF, bouleGt.mat(MT.NikolineAlloy   , 9));
616 616
 			RM.CrystallisationCrucible.addRecipe1(T, 16, 648000, OM.dust(MT.TeslatineAlloy      ), FL.array(FL.mul(tFluid, 9), MT.TeslatineAlloy.liquid(35*U , T)), NF, bouleGt.mat(MT.TeslatineAlloy  , 9));
617 617
 			
618
-			RM.CrystallisationCrucible.addRecipe1(T,512,  18000, OM.dust(MT.Al2O3          ,  U9), FL.array(       tFluid    , MT.Al2O3         .liquid(29*U9, T)), NF, bouleGt.mat(MT.Sapphire        , 1));
619
-			RM.CrystallisationCrucible.addRecipe1(T,512, 156000, OM.dust(MT.Al2O3               ), FL.array(FL.mul(tFluid, 9), MT.Al2O3         .liquid(29*U , T)), NF, bouleGt.mat(MT.Sapphire        , 9));
618
+			RM.CrystallisationCrucible.addRecipe1(T,128,  18000, OM.dust(MT.Al2O3          ,  U9), FL.array(       tFluid    , MT.Al2O3         .liquid(29*U9, T)), NF, bouleGt.mat(MT.Sapphire        , 1));
619
+			RM.CrystallisationCrucible.addRecipe1(T,128, 156000, OM.dust(MT.Al2O3               ), FL.array(FL.mul(tFluid, 9), MT.Al2O3         .liquid(29*U , T)), NF, bouleGt.mat(MT.Sapphire        , 9));
620 620
 			
621
-			RM.CrystallisationCrucible.addRecipe1(T,512,  18000, OM.dust(MT.Mg             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.GreenSapphire   , 1));
622
-			RM.CrystallisationCrucible.addRecipe1(T,512,  18000, OM.dust(MT.Ti             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.YellowSapphire  , 1));
623
-			RM.CrystallisationCrucible.addRecipe1(T,512,  18000, OM.dust(MT.Cu             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.OrangeSapphire  , 1));
624
-			RM.CrystallisationCrucible.addRecipe1(T,512,  18000, OM.dust(MT.Fe             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.BlueSapphire    , 1));
625
-			RM.CrystallisationCrucible.addRecipe1(T,512,  18000, OM.dust(MT.V              ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.PurpleSapphire  , 1));
626
-			RM.CrystallisationCrucible.addRecipe1(T,512,  18000, OM.dust(MT.Cr             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.Ruby            , 1));
627
-			RM.CrystallisationCrucible.addRecipe1(T,512,  52000, OM.dust(MT.Mg             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.GreenSapphire   , 3));
628
-			RM.CrystallisationCrucible.addRecipe1(T,512,  52000, OM.dust(MT.Ti             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.YellowSapphire  , 3));
629
-			RM.CrystallisationCrucible.addRecipe1(T,512,  52000, OM.dust(MT.Cu             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.OrangeSapphire  , 3));
630
-			RM.CrystallisationCrucible.addRecipe1(T,512,  52000, OM.dust(MT.Fe             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.BlueSapphire    , 3));
631
-			RM.CrystallisationCrucible.addRecipe1(T,512,  52000, OM.dust(MT.V              ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.PurpleSapphire  , 3));
632
-			RM.CrystallisationCrucible.addRecipe1(T,512,  52000, OM.dust(MT.Cr             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.Ruby            , 3));
621
+			RM.CrystallisationCrucible.addRecipe1(T,128,  18000, OM.dust(MT.Mg             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.GreenSapphire   , 1));
622
+			RM.CrystallisationCrucible.addRecipe1(T,128,  18000, OM.dust(MT.Ti             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.YellowSapphire  , 1));
623
+			RM.CrystallisationCrucible.addRecipe1(T,128,  18000, OM.dust(MT.Cu             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.OrangeSapphire  , 1));
624
+			RM.CrystallisationCrucible.addRecipe1(T,128,  18000, OM.dust(MT.Fe             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.BlueSapphire    , 1));
625
+			RM.CrystallisationCrucible.addRecipe1(T,128,  18000, OM.dust(MT.V              ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.PurpleSapphire  , 1));
626
+			RM.CrystallisationCrucible.addRecipe1(T,128,  18000, OM.dust(MT.Cr             ,2*U3), FL.array(       tFluid    , MT.Al2O3         .liquid(10*U3, T)), NF, bouleGt.mat(MT.Ruby            , 1));
627
+			RM.CrystallisationCrucible.addRecipe1(T,128,  52000, OM.dust(MT.Mg             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.GreenSapphire   , 3));
628
+			RM.CrystallisationCrucible.addRecipe1(T,128,  52000, OM.dust(MT.Ti             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.YellowSapphire  , 3));
629
+			RM.CrystallisationCrucible.addRecipe1(T,128,  52000, OM.dust(MT.Cu             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.OrangeSapphire  , 3));
630
+			RM.CrystallisationCrucible.addRecipe1(T,128,  52000, OM.dust(MT.Fe             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.BlueSapphire    , 3));
631
+			RM.CrystallisationCrucible.addRecipe1(T,128,  52000, OM.dust(MT.V              ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.PurpleSapphire  , 3));
632
+			RM.CrystallisationCrucible.addRecipe1(T,128,  52000, OM.dust(MT.Cr             ,2*U ), FL.array(FL.mul(tFluid, 3), MT.Al2O3         .liquid(10*U , T)), NF, bouleGt.mat(MT.Ruby            , 3));
633 633
 		}
634 634
 		
635 635
 		for (ItemStack tTNT : ST.array(ST.make(Blocks.tnt, 8, W), IL.IC2_ITNT.get(4), IL.Dynamite.get(2), IL.Dynamite_Strong.get(1))) if (ST.valid(tTNT)) {

+ 9
- 2
src/main/java/gregtech/loaders/c/Loader_Recipes_Temporary.java View File

@@ -430,13 +430,20 @@ public class Loader_Recipes_Temporary implements Runnable {
430 430
 		
431 431
 		/*
432 432
 		if (MD.PFAA.mLoaded) {
433
+			IL.PFAA_Sands.getWithMeta(1, 0); // Basaltic Magnetite
434
+			IL.PFAA_Sands.getWithMeta(1, 1); // Cassiterite
435
+			IL.PFAA_Sands.getWithMeta(1, 2); // Garnet
436
+			IL.PFAA_Sands.getWithMeta(1, 3); // Granitic Magnetite
437
+			IL.PFAA_Sands.getWithMeta(1, 4); // Quartz
438
+			IL.PFAA_Sands.getWithMeta(1, 5); // Volcanic Ash
439
+			IL.PFAA_Sands.getWithMeta(1, 6); // Glauconite
433 440
 			// TODO Basaltic Mineral Sand
434 441
 			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1));
435 442
 			RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
436 443
 			RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}         , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.BasalticMineralSand, 1), dust.mat(MT.V2O5, 1));
437 444
 			// TODO Granitic Mineral Sand
438
-			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1));
439
-			RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.GraniteBlack, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
445
+			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}     , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.Granite, 1), nugget.mat(MT.Au, 1));
446
+			RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}, IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), rockGt.mat(MT.Granite, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
440 447
 			RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}         , IL.RH_Sand_Magnetite.get(1), dust.mat(MT.OREMATS.GraniticMineralSand, 1), dust.mat(MT.V2O5, 1));
441 448
 			// TODO Cassiterite Sand
442 449
 			RM.Sifting          .addRecipe1(T, 16, 128, new long[] {10000, 10, 40, 150, 200, 400, 500}, crushedPurified.mat(MT.OREMATS.Cassiterite, 1), crushedCentrifuged.mat(MT.OREMATS.Cassiterite, 1), gemExquisite.mat(MT.Zircon, 1), gemFlawless.mat(MT.Zircon, 1), gem.mat(MT.Zircon, 1), gemFlawed.mat(MT.Zircon, 1), gemChipped.mat(MT.Zircon, 1), dust.mat(MT.Zircon, 1));

+ 22
- 20
src/main/java/gregtech/tileentity/tools/MultiTileEntitySiftingTable.java View File

@@ -92,7 +92,7 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
92 92
 		aList.add(Chat.CYAN     + LH.get(LH.RECIPES_SIFTER_USAGE));
93 93
 		aList.add(Chat.ORANGE   + LH.get(LH.NO_GUI_CLICK_TO_INTERACT)   + " (" + LH.get(LH.FACE_TOP) + ")");
94 94
 	}
95
-
95
+	
96 96
 	@Override
97 97
 	public void onTick2(long aTimer, boolean aIsServerSide) {
98 98
 		if (aIsServerSide) {
@@ -119,6 +119,7 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
119 119
 				if (IL.RH_Sand_Magnetite            .equal(tStack, T, T)) {mDisplayedInput =- 5;} else
120 120
 				if (IL.TROPIC_Sand_Black            .equal(tStack, F, T)) {mDisplayedInput =-11;} else
121 121
 				if (IL.TROPIC_Sand_Black            .equal(tStack, T, T)) {mDisplayedInput = -5;} else
122
+				if (IL.PFAA_Sands                   .equal(tStack, T, T)) {mDisplayedInput =-11;} else
122 123
 				if (IL.NePl_SoulSoil                .equal(tStack, F, T)) {mDisplayedInput = -9;} else
123 124
 				if (IL.NeLi_SoulSoil                .equal(tStack, F, T)) {mDisplayedInput = -9;} else
124 125
 				if (IL.NeLi_Gravel                  .equal(tStack, F, T)) {mDisplayedInput =-11;} else
@@ -186,6 +187,7 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
186 187
 				if (IL.RH_Sand_Magnetite            .equal(tStack, T, T)) {mDisplayedOutput = -5;} else
187 188
 				if (IL.TROPIC_Sand_Black            .equal(tStack, F, T)) {mDisplayedOutput =-11;} else
188 189
 				if (IL.TROPIC_Sand_Black            .equal(tStack, T, T)) {mDisplayedOutput = -5;} else
190
+				if (IL.PFAA_Sands                   .equal(tStack, T, T)) {mDisplayedOutput =-11;} else
189 191
 				if (IL.NePl_SoulSoil                .equal(tStack, F, T)) {mDisplayedOutput = -9;} else
190 192
 				if (IL.NeLi_SoulSoil                .equal(tStack, F, T)) {mDisplayedOutput = -9;} else
191 193
 				if (IL.NeLi_Gravel                  .equal(tStack, F, T)) {mDisplayedOutput =-11;} else
@@ -234,17 +236,17 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
234 236
 				}
235 237
 				break;
236 238
 			}
237
-
239
+			
238 240
 			if (aTimer % 5 == 0 && (mState & B[2]) != 0) {
239 241
 				mState &= ~B[2];
240 242
 				for (Entry<EntityPlayer, ChunkCoordinates> tEntry : PLAYER_LAST_CLICKED.entrySet()) {
241 243
 					if (getCoords().equals(tEntry.getValue()) && tEntry.getKey().getDistanceSq(xCoord+0.5, yCoord+0.5, zCoord+0.5) <= 64) {
242 244
 						mState |= B[2];
243
-
245
+						
244 246
 						boolean temp = T;
245 247
 						for (int i = 1; i < 13; i++) if (slotHas(i)) {temp = F; break;}
246 248
 						ItemStack aStack = slot(0);
247
-
249
+						
248 250
 						if (temp && (++mClickCount >= 8 || UT.Entities.hasInfiniteItems(tEntry.getKey()))) {
249 251
 							mClickCount = 0;
250 252
 							Recipe tRecipe = mRecipes.findRecipe(this, mLastRecipe, F, V[1], null, ZL_FS, aStack);
@@ -270,9 +272,9 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
270 272
 			}
271 273
 		}
272 274
 	}
273
-
275
+	
274 276
 	@Override public boolean attachCoversFirst(byte aSide) {return F;}
275
-
277
+	
276 278
 	@Override
277 279
 	public boolean onBlockActivated3(EntityPlayer aPlayer, byte aSide, float aHitX, float aHitY, float aHitZ) {
278 280
 		if (isServerSide()) {
@@ -299,12 +301,12 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
299 301
 		}
300 302
 		return T;
301 303
 	}
302
-
304
+	
303 305
 	@Override
304 306
 	public boolean onTickCheck(long aTimer) {
305 307
 		return super.onTickCheck(aTimer) || mState != oState || mDisplayedOutput != oDisplayedOutput || mDisplayedInput != oDisplayedInput;
306 308
 	}
307
-
309
+	
308 310
 	@Override
309 311
 	public void onTickResetChecks(long aTimer, boolean aIsServerSide) {
310 312
 		super.onTickResetChecks(aTimer, aIsServerSide);
@@ -312,7 +314,7 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
312 314
 		oDisplayedInput  = mDisplayedInput;
313 315
 		oDisplayedOutput = mDisplayedOutput;
314 316
 	}
315
-
317
+	
316 318
 	@Override
317 319
 	public IPacket getClientDataPacket(boolean aSendAll) {
318 320
 		if (aSendAll)                             return getClientDataPacketByteArray(aSendAll, mState, UT.Code.toByteS(mDisplayedOutput, 0), UT.Code.toByteS(mDisplayedOutput, 1), UT.Code.toByteS(mDisplayedInput, 0), UT.Code.toByteS(mDisplayedInput, 1), (byte)UT.Code.getR(mRGBa), (byte)UT.Code.getG(mRGBa), (byte)UT.Code.getB(mRGBa));
@@ -320,7 +322,7 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
320 322
 		if (mDisplayedOutput != oDisplayedOutput) return getClientDataPacketByteArray(aSendAll, mState, UT.Code.toByteS(mDisplayedOutput, 0), UT.Code.toByteS(mDisplayedOutput, 1));
321 323
 		return getClientDataPacketByte(aSendAll, mState);
322 324
 	}
323
-
325
+	
324 326
 	@Override
325 327
 	public boolean receiveDataByteArray(byte[] aData, INetworkHandler aNetworkHandler) {
326 328
 		mState = aData[0];
@@ -329,24 +331,24 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
329 331
 		if (aData.length > 7) mRGBa = UT.Code.getRGBInt(new short[] {UT.Code.unsignB(aData[5]), UT.Code.unsignB(aData[6]), UT.Code.unsignB(aData[7])});
330 332
 		return T;
331 333
 	}
332
-
334
+	
333 335
 	@Override
334 336
 	public void setVisualData(byte aData) {
335 337
 		mState = aData;
336 338
 	}
337
-
339
+	
338 340
 	@Override
339 341
 	public int getRenderPasses2(Block aBlock, boolean[] aShouldSideBeRendered) {
340 342
 		boolean tGlow = mMaterial.contains(TD.Properties.GLOWING);
341
-
343
+		
342 344
 		mTextureLegs   = BlockTextureMulti.get(BlockTextureDefault.get(sTextureLegs  , mRGBa, F, tGlow, F, F), BlockTextureDefault.get(sOverlayLegs));
343 345
 		mTextureGrid   = BlockTextureMulti.get(BlockTextureDefault.get(sTextureGrid  , mRGBa, F, tGlow, F, F), BlockTextureDefault.get(sOverlayGrid));
344 346
 		mTextureBorder = BlockTextureMulti.get(BlockTextureDefault.get(sTextureBorder, mRGBa, F, tGlow, F, F), BlockTextureDefault.get(sOverlayBorder));
345 347
 		mTexturePlate  = BlockTextureMulti.get(BlockTextureDefault.get(sTexturePlate , mRGBa, F, tGlow, F, F), BlockTextureDefault.get(sOverlayPlate));
346
-
348
+		
347 349
 		mTextureInput  = BlockTextureDefault.get(MT.NULL, OP.blockDust, CA_GRAY_64, F);
348 350
 		mTextureOutput = BlockTextureDefault.get(MT.NULL, OP.blockDust, CA_GRAY_64, F);
349
-
351
+		
350 352
 		if (mDisplayedInput != 0) {
351 353
 			if (UT.Code.exists(mDisplayedInput, OreDictMaterial.MATERIAL_ARRAY)) {
352 354
 				OreDictMaterial tMaterial = OreDictMaterial.MATERIAL_ARRAY[mDisplayedInput];
@@ -387,10 +389,10 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
387 389
 				}
388 390
 			}
389 391
 		}
390
-
392
+		
391 393
 		return 9;
392 394
 	}
393
-
395
+	
394 396
 	@Override
395 397
 	public boolean setBlockBounds2(Block aBlock, int aRenderPass, boolean[] aShouldSideBeRendered) {
396 398
 		switch(aRenderPass) {
@@ -406,7 +408,7 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
406 408
 		}
407 409
 		return F;
408 410
 	}
409
-
411
+	
410 412
 	public static IIconContainer
411 413
 	sTextureLegs    = new Textures.BlockIcons.CustomIcon("machines/tools/sifting_table/colored/legs"),
412 414
 	sTextureGrid    = new Textures.BlockIcons.CustomIcon("machines/tools/sifting_table/colored/grid"),
@@ -416,9 +418,9 @@ public class MultiTileEntitySiftingTable extends TileEntityBase07Paintable imple
416 418
 	sOverlayGrid    = new Textures.BlockIcons.CustomIcon("machines/tools/sifting_table/overlay/grid"),
417 419
 	sOverlayBorder  = new Textures.BlockIcons.CustomIcon("machines/tools/sifting_table/overlay/border"),
418 420
 	sOverlayPlate   = new Textures.BlockIcons.CustomIcon("machines/tools/sifting_table/overlay/plate");
419
-
421
+	
420 422
 	private ITexture mTextureLegs, mTextureGrid, mTextureBorder, mTexturePlate, mTextureInput, mTextureOutput;
421
-
423
+	
422 424
 	@Override
423 425
 	public ITexture getTexture2(Block aBlock, int aRenderPass, byte aSide, boolean[] aShouldSideBeRendered) {
424 426
 		if (aRenderPass == 0) return SIDES_TOP[aSide]?BlockTextureMulti.get(mTextureLegs, BI.nei()):mTextureLegs;

Loading…
Cancel
Save