Browse Source

Fixed some issues with the Stuff I just added

parent
commit
23d0405ebd
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 4C7DC365E9F99806

+ 2
- 2
src/main/java/gregapi/NEI_GT_API_Config.java View File

@@ -24,6 +24,7 @@ import static gregapi.data.CS.*;
24 24
 import gregapi.data.MD;
25 25
 import gregapi.recipes.Recipe.RecipeMap;
26 26
 import gregapi.tileentity.tools.MultiTileEntityAdvancedCraftingTable.MultiTileEntityGUIClientAdvancedCraftingTable;
27
+import gregtech.BuildInfo;
27 28
 
28 29
 /**
29 30
  * @author Gregorius Techneticies
@@ -52,9 +53,8 @@ public class NEI_GT_API_Config implements codechicken.nei.api.IConfigureNEI {
52 53
 		return MD.GAPI.mName + " NEI Plugin";
53 54
 	}
54 55
 	
55
-	/** This is just the last time I was looking at this Version Number :P */
56 56
 	@Override
57 57
 	public String getVersion() {
58
-		return "6.09.12";
58
+		return BuildInfo.version;
59 59
 	}
60 60
 }

+ 18
- 12
src/main/java/gregapi/NEI_RecipeMap.java View File

@@ -608,25 +608,31 @@ public class NEI_RecipeMap extends TemplateRecipeHandler {
608 608
 	
609 609
 	@Override
610 610
 	public void drawExtras(int aRecipeIndex) {
611
-		long tEUt       = ((CachedDefaultRecipe)arecipes.get(aRecipeIndex)).mRecipe.mEUt;
611
+		long tGUt       = ((CachedDefaultRecipe)arecipes.get(aRecipeIndex)).mRecipe.mEUt;
612 612
 		long tDuration  = ((CachedDefaultRecipe)arecipes.get(aRecipeIndex)).mRecipe.mDuration;
613
-		if (tEUt == 0) {
613
+		if (tGUt == 0) {
614 614
 			drawText(10, 93, "Tier: unspecified", 0xFF000000);
615 615
 		} else {
616
-			if (tEUt > 0) {
617
-				drawText(10, 73, "Costs: " + (tDuration*tEUt) + " GU", 0xFF000000);
618
-				drawText(10, 83, "Usage: " + tEUt + " GU/t" , 0xFF000000);
616
+			if (tGUt > 0) {
617
+				drawText    (10, 73, "Costs: "  + (tDuration*tGUt) + " GU"        , 0xFF000000);
619 618
 				if (mRecipeMap.mShowVoltageAmperageInNEI) {
620
-					drawText(10, 93, "Tier: " + tEUt / mRecipeMap.mPower + " GU", 0xFF000000);
621
-					drawText(10,103, "Power: " + mRecipeMap.mPower, 0xFF000000);
619
+					drawText(10, 83, "Usage: "  + tGUt + " GU/t"                  , 0xFF000000);
620
+					drawText(10, 93, "Tier: "   + tGUt / mRecipeMap.mPower + " GU", 0xFF000000);
621
+					drawText(10,103, "Power: "  + mRecipeMap.mPower               , 0xFF000000);
622
+				} else {
623
+					if (tGUt != 1)
624
+					drawText(10, 83, "Usage: "  + tGUt + " GU/t"                  , 0xFF000000);
622 625
 				}
623 626
 			} else {
624
-				tEUt *= -1;
625
-				drawText(10, 73, "Gain: " + (tDuration*tEUt) + " GU", 0xFF000000);
626
-				drawText(10, 83, "Output: " + tEUt + " GU/t", 0xFF000000);
627
+				tGUt *= -1;
628
+				drawText    (10, 73, "Gain: "   + (tDuration*tGUt) + " GU"        , 0xFF000000);
627 629
 				if (mRecipeMap.mShowVoltageAmperageInNEI) {
628
-					drawText(10, 93, "Tier: " + tEUt / mRecipeMap.mPower + " GU", 0xFF000000);
629
-					drawText(10,103, "Power: " + mRecipeMap.mPower, 0xFF000000);
630
+					drawText(10, 83, "Output: " + tGUt + " GU/t"                  , 0xFF000000);
631
+					drawText(10, 93, "Tier: "   + tGUt / mRecipeMap.mPower + " GU", 0xFF000000);
632
+					drawText(10,103, "Power: "  + mRecipeMap.mPower               , 0xFF000000);
633
+				} else {
634
+					if (tGUt != 1)
635
+					drawText(10, 83, "Output: " + tGUt + " GU/t"                  , 0xFF000000);
630 636
 				}
631 637
 			}
632 638
 		}

+ 2
- 2
src/main/java/gregapi/data/FM.java View File

@@ -37,8 +37,8 @@ public class FM {
37 37
 	public static final RecipeMap
38 38
 	  Furnace       = new RecipeMapFurnaceFuel  (null, "mc.recipe.furnacefuel"      , "Furnace Fuels"      , "smelting"    , 0, 1, RES_PATH_GUI+"machines/E_Furnace"   ,/*IN-OUT-MIN-ITEM=*/ 1, 1, 1,/*IN-OUT-MIN-FLUID=*/ 0, 0, 0,/*MIN*/ 0,/*AMP=*/ 1, "", 1, "", T, F, F, F)
39 39
 	
40
-	, FluidBed      = new RecipeMapFuel         (null, "gt.recipe.fuels.fluidbed"   , "Fluidized Bed Fuels", null          , 0, 1, RES_PATH_GUI+"machines/Default"     ,/*IN-OUT-MIN-ITEM=*/ 1, 2, 1,/*IN-OUT-MIN-FLUID=*/ 1, 2, 1,/*MIN*/ 2,/*AMP=*/ 1, "", 1, "", T, T, T, F)
41
-	, Burn          = new RecipeMapFuel         (null, "gt.recipe.fuels.burn"       , "Burnable Fuels"     , null          , 0, 1, RES_PATH_GUI+"machines/Default"     ,/*IN-OUT-MIN-ITEM=*/ 1, 2, 0,/*IN-OUT-MIN-FLUID=*/ 1, 2, 0,/*MIN*/ 1,/*AMP=*/ 1, "", 1, "", T, T, T, F)
40
+	, FluidBed      = new RecipeMapFuel         (null, "gt.recipe.fuels.fluidbed"   , "Fluidized Bed Fuels", null          , 0, 1, RES_PATH_GUI+"machines/Default"     ,/*IN-OUT-MIN-ITEM=*/ 1, 2, 1,/*IN-OUT-MIN-FLUID=*/ 1, 2, 1,/*MIN*/ 2,/*AMP=*/ 1, "", 1, "", F, T, T, F)
41
+	, Burn          = new RecipeMapFuel         (null, "gt.recipe.fuels.burn"       , "Burnable Fuels"     , null          , 0, 1, RES_PATH_GUI+"machines/Default"     ,/*IN-OUT-MIN-ITEM=*/ 1, 2, 0,/*IN-OUT-MIN-FLUID=*/ 1, 2, 0,/*MIN*/ 1,/*AMP=*/ 1, "", 1, "", F, T, T, F)
42 42
 	, Gas           = new RecipeMapFuel         (null, "gt.recipe.fuels.gas"        , "Gas Fuels"          , null          , 0, 1, RES_PATH_GUI+"machines/Default"     ,/*IN-OUT-MIN-ITEM=*/ 1, 2, 0,/*IN-OUT-MIN-FLUID=*/ 1, 2, 0,/*MIN*/ 1,/*AMP=*/ 1, "", 1, "", T, T, T, F)
43 43
 	, Hot           = new RecipeMapFuel         (null, "gt.recipe.fuels.hot"        , "Hot Fuels"          , null          , 0, 1, RES_PATH_GUI+"machines/Default"     ,/*IN-OUT-MIN-ITEM=*/ 1, 2, 0,/*IN-OUT-MIN-FLUID=*/ 1, 2, 0,/*MIN*/ 1,/*AMP=*/ 1, "", 1, "", T, T, T, F)
44 44
 	, Plasma        = new RecipeMapFuel         (null, "gt.recipe.fuels.plasma"     , "Plasma Fuels"       , null          , 0, 1, RES_PATH_GUI+"machines/Default"     ,/*IN-OUT-MIN-ITEM=*/ 1, 2, 0,/*IN-OUT-MIN-FLUID=*/ 1, 2, 0,/*MIN*/ 1,/*AMP=*/ 1, "", 1, "", T, T, T, F)

+ 5
- 5
src/main/java/gregtech/loaders/b/Loader_Fuels.java View File

@@ -35,11 +35,11 @@ public class Loader_Fuels implements Runnable {
35 35
 	@Override
36 36
 	public void run() {
37 37
 		for (OreDictMaterial tMat : new OreDictMaterial[] {MT.Charcoal, MT.Coal, MT.CoalCoke, MT.Lignite, MT.LigniteCoke, MT.Anthracite, MT.Prismane, MT.Lonsdaleite, MT.PetCoke, MT.Peat, MT.PeatBituminous}) {
38
-		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK) *  9, OP.blockDust.mat(tMat, 1), FL.Calcite.make(648), NF, OM.dust(tMat, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U*9, F)));
39
-		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK)     , OP.dust     .mat(tMat, 1), FL.Calcite.make( 72), NF, OM.dust(tMat, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U  , F)));
40
-		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK) /  4, OP.dustSmall.mat(tMat, 1), FL.Calcite.make( 18), NF, OM.dust(tMat, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U4 , F)));
41
-		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK) /  9, OP.dustTiny .mat(tMat, 1), FL.Calcite.make(  8), NF, OM.dust(tMat, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U9 , F)));
42
-		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK) / 72, OP.dustDiv72.mat(tMat, 1), FL.Calcite.make(  1), NF, OM.dust(tMat, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U72, F)));
38
+		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK) *  9, OP.blockDust.mat(tMat, 1), FL.Calcite.make(648), NF, OM.dust(tMat.mTargetBurning.mMaterial, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U*9, F)));
39
+		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK)     , OP.dust     .mat(tMat, 1), FL.Calcite.make( 72), NF, OM.dust(tMat.mTargetBurning.mMaterial, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U  , F)));
40
+		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK) /  4, OP.dustSmall.mat(tMat, 1), FL.Calcite.make( 18), NF, OM.dust(tMat.mTargetBurning.mMaterial, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U4 , F)));
41
+		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK) /  9, OP.dustTiny .mat(tMat, 1), FL.Calcite.make(  8), NF, OM.dust(tMat.mTargetBurning.mMaterial, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U9 , F)));
42
+		FM.FluidBed     .addRecipe1(T, -1, (tMat.mFurnaceBurnTime * 3 * EU_PER_FURNACE_TICK) / 72, OP.dustDiv72.mat(tMat, 1), FL.Calcite.make(  1), NF, OM.dust(tMat.mTargetBurning.mMaterial, UT.Code.units(tMat.mTargetBurning.mAmount, U*2, U72, F)));
43 43
 		}
44 44
 		
45 45
 		FM.Burn         .addRecipe0(T, - 64,  1, UT.Fluids.make("liquid_extra_heavy_oil", 1)        , UT.Fluids.make("carbondioxide", 1), ZL_IS);

+ 20
- 20
src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java View File

@@ -540,26 +540,26 @@ public class Loader_MultiTileEntities implements Runnable {
540 540
 		
541 541
 		// Fluidized Burning Boxes
542 542
 		aClass = MultiTileEntityGeneratorFluidBed.class;
543
-		aMat = MT.Pb;               aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9000,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  5000, NBT_OUTPUT,  64, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
544
-		aMat = MT.Bi;               aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9001,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  4500, NBT_OUTPUT,  80, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
545
-		aMat = MT.Bronze;           aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9002,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   7.0F, NBT_RESISTANCE,   7.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  7500, NBT_OUTPUT,  96, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
546
-		aMat = MT.Invar;            aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9003,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY, 10000, NBT_OUTPUT,  64, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
547
-		aMat = ANY.Steel;           aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9004,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   6.0F, NBT_RESISTANCE,   6.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  7000, NBT_OUTPUT, 128, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
548
-		aMat = MT.Cr;               aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9005,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  8500, NBT_OUTPUT, 448, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
549
-		aMat = MT.Ti;               aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9006,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   9.0F, NBT_RESISTANCE,   9.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  8500, NBT_OUTPUT, 384, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
550
-		aMat = ANY.W;               aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9007,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  10.0F, NBT_RESISTANCE,  10.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  9500, NBT_OUTPUT, 512, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
551
-		aMat = MT.TungstenSteel;    aRegistry.add("Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"          , "Burning Boxes"         ,  9008,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  12.5F, NBT_RESISTANCE,  12.5F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  9000, NBT_OUTPUT, 512, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
552
-		
553
-		aMat = MT.Pb;               aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9050,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  5000, NBT_OUTPUT, 256, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
554
-		aMat = MT.Bi;               aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9051,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  4500, NBT_OUTPUT, 320, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
555
-		aMat = MT.Bronze;           aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9052,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   7.0F, NBT_RESISTANCE,   7.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  7500, NBT_OUTPUT, 384, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
556
-		aMat = MT.Invar;            aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9053,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY, 10000, NBT_OUTPUT, 256, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
557
-		aMat = ANY.Steel;           aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9054,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   6.0F, NBT_RESISTANCE,   6.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  7000, NBT_OUTPUT, 512, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
558
-		aMat = MT.Cr;               aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9055,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  8500, NBT_OUTPUT,1792, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
559
-		aMat = MT.Ti;               aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9056,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   9.0F, NBT_RESISTANCE,   9.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  8500, NBT_OUTPUT,1536, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
560
-		aMat = ANY.W;               aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9057,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  10.0F, NBT_RESISTANCE,  10.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  9500, NBT_OUTPUT,2048, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
561
-		aMat = MT.TungstenSteel;    aRegistry.add("Dense Fluidized Bed Burning Box (Gas, " + aMat.getLocal() + ")"    , "Burning Boxes"         ,  9058,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  12.5F, NBT_RESISTANCE,  12.5F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  9000, NBT_OUTPUT,2048, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
562
-				
543
+		aMat = MT.Pb;               aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9000,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  5000, NBT_OUTPUT,  64, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
544
+		aMat = MT.Bi;               aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9001,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  4500, NBT_OUTPUT,  80, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
545
+		aMat = MT.Bronze;           aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9002,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   7.0F, NBT_RESISTANCE,   7.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  7500, NBT_OUTPUT,  96, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
546
+		aMat = MT.Invar;            aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9003,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY, 10000, NBT_OUTPUT,  64, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
547
+		aMat = ANY.Steel;           aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9004,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   6.0F, NBT_RESISTANCE,   6.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  7000, NBT_OUTPUT, 128, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
548
+		aMat = MT.Cr;               aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9005,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  8500, NBT_OUTPUT, 448, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
549
+		aMat = MT.Ti;               aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9006,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   9.0F, NBT_RESISTANCE,   9.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  8500, NBT_OUTPUT, 384, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
550
+		aMat = ANY.W;               aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9007,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  10.0F, NBT_RESISTANCE,  10.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  9500, NBT_OUTPUT, 512, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
551
+		aMat = MT.TungstenSteel;    aRegistry.add("Fluidized Bed Burning Box (" + aMat.getLocal() + ")"      , "Burning Boxes"                  ,  9008,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  12.5F, NBT_RESISTANCE,  12.5F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  9000, NBT_OUTPUT, 512, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plate.dat(aMat), 'C', OP.plateDouble.dat(ANY.Cu));
552
+		
553
+		aMat = MT.Pb;               aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9050,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  5000, NBT_OUTPUT, 256, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
554
+		aMat = MT.Bi;               aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9051,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  4500, NBT_OUTPUT, 320, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
555
+		aMat = MT.Bronze;           aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9052,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   7.0F, NBT_RESISTANCE,   7.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  7500, NBT_OUTPUT, 384, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
556
+		aMat = MT.Invar;            aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9053,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY, 10000, NBT_OUTPUT, 256, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
557
+		aMat = ANY.Steel;           aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9054,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   6.0F, NBT_RESISTANCE,   6.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  7000, NBT_OUTPUT, 512, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
558
+		aMat = MT.Cr;               aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9055,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   4.0F, NBT_RESISTANCE,   4.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  8500, NBT_OUTPUT,1792, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
559
+		aMat = MT.Ti;               aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9056,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   9.0F, NBT_RESISTANCE,   9.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  8500, NBT_OUTPUT,1536, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
560
+		aMat = ANY.W;               aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9057,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  10.0F, NBT_RESISTANCE,  10.0F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  9500, NBT_OUTPUT,2048, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
561
+		aMat = MT.TungstenSteel;    aRegistry.add("Dense Fluidized Bed Burning Box (" + aMat.getLocal() + ")", "Burning Boxes"                  ,  9058,  1104, aClass, aMat.mToolQuality, 16, aMachine     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,  12.5F, NBT_RESISTANCE,  12.5F, NBT_COLOR, UT.Code.getRGBInt(aMat.fRGBaSolid), NBT_FUELMAP, FM.FluidBed, NBT_EFFICIENCY,  9000, NBT_OUTPUT,2048, NBT_ENERGY_EMITTED, TD.Energy.HU), "PCP", "UwU", "BUB", 'B', Blocks.brick_block, 'U', OP.plateCurved.dat(aMat), 'P', OP.plateQuintuple.dat(aMat), 'C', OP.plateDense.dat(ANY.Cu));
562
+		
563 563
 		
564 564
 		// Steam Turbines
565 565
 		aClass = MultiTileEntityTurbineSteam.class;

+ 12
- 2
src/main/java/gregtech/tileentity/energy/MultiTileEntityGeneratorFluidBed.java View File

@@ -39,6 +39,8 @@ import gregapi.render.BlockTextureDefault;
39 39
 import gregapi.render.BlockTextureMulti;
40 40
 import gregapi.render.IIconContainer;
41 41
 import gregapi.render.ITexture;
42
+import gregapi.tileentity.ITileEntityFunnelAccessible;
43
+import gregapi.tileentity.ITileEntityTapAccessible;
42 44
 import gregapi.tileentity.base.TileEntityBase09FacingSingle;
43 45
 import gregapi.tileentity.energy.ITileEntityEnergy;
44 46
 import gregapi.tileentity.machines.ITileEntityRunningActively;
@@ -53,12 +55,13 @@ import net.minecraft.item.ItemStack;
53 55
 import net.minecraft.nbt.NBTTagCompound;
54 56
 import net.minecraft.util.AxisAlignedBB;
55 57
 import net.minecraftforge.fluids.FluidStack;
58
+import net.minecraftforge.fluids.IFluidHandler;
56 59
 import net.minecraftforge.fluids.IFluidTank;
57 60
 
58 61
 /**
59 62
  * @author Gregorius Techneticies
60 63
  */
61
-public class MultiTileEntityGeneratorFluidBed extends TileEntityBase09FacingSingle implements ITileEntityEnergy, ITileEntityRunningActively, IMTE_GetCollisionBoundingBoxFromPool, IMTE_OnEntityCollidedWithBlock {
64
+public class MultiTileEntityGeneratorFluidBed extends TileEntityBase09FacingSingle implements IFluidHandler, ITileEntityTapAccessible, ITileEntityFunnelAccessible, ITileEntityEnergy, ITileEntityRunningActively, IMTE_GetCollisionBoundingBoxFromPool, IMTE_OnEntityCollidedWithBlock {
62 65
 	private static int FLAME_RANGE = 2;
63 66
 	
64 67
 	protected short mEfficiency = 10000;
@@ -215,7 +218,7 @@ public class MultiTileEntityGeneratorFluidBed extends TileEntityBase09FacingSing
215 218
 	
216 219
 	@Override
217 220
 	protected IFluidTank getFluidTankFillable2(byte aSide, FluidStack aFluidToFill) {
218
-		return mRecipes.containsInput(aFluidToFill, this, NI) && !UT.Fluids.gas(aFluidToFill) ? mTank : null;
221
+		return mRecipes.containsInput(aFluidToFill, this, NI) ? mTank : null;
219 222
 	}
220 223
 	
221 224
 	@Override
@@ -234,6 +237,13 @@ public class MultiTileEntityGeneratorFluidBed extends TileEntityBase09FacingSing
234 237
 		return mTank.drain(aMaxDrain, aDoDrain);
235 238
 	}
236 239
 	
240
+	@Override
241
+	public int funnelFill(byte aSide, FluidStack aFluid, boolean aDoFill) {
242
+		if (!mRecipes.containsInput(aFluid, this, NI)) return 0;
243
+		updateInventory();
244
+		return mTank.fill(aFluid, aDoFill);
245
+	}
246
+	
237 247
 	@Override public ITexture getTexture2(Block aBlock, int aRenderPass, byte aSide, boolean[] aShouldSideBeRendered) {return aShouldSideBeRendered[aSide] ? BlockTextureMulti.get(BlockTextureDefault.get(sColoreds[FACING_ROTATIONS[mFacing][aSide]], mRGBa), BlockTextureDefault.get((mBurning?sOverlaysActive:sOverlays)[FACING_ROTATIONS[mFacing][aSide]])): null;}
238 248
 	
239 249
 	@Override public void onEntityCollidedWithBlock(Entity aEntity) {if (mBurning) UT.Entities.applyHeatDamage(aEntity, Math.min(10.0F, mRate / 10.0F));}

Loading…
Cancel
Save