Browse Source

Fixed NEI Crucible thing

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

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

@@ -3282,8 +3282,8 @@ public class MT {
3282 3282
 		Vermiculite             = oredustelec( 9152, "Vermiculite"               , SET_METALLIC  , 200, 180,  15, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,10*U, Fe               , 3*U, SiO2             ,12*U, H2O              ,12*U, H                , 2*U)                        , // (Mg+2, Fe+2, Fe+3)3 [(AlSi)4O10] (OH)2 4H2O)
3283 3283
 		Mica                    = oredustelec( 9158, "Mica"                      , SET_FINE      , 195, 195, 205, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,15*U, K                , 2*U, SiO2             ,18*U, F                , 4*U)                                                , // KAl2(AlSi3O10)(F,OH)2
3284 3284
 		Kaolinite               = oredustelec( 9167, "Kaolinite"                 , SET_DULL      , 245, 235, 235, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          , 5*U, SiO2             , 6*U, H2O              , 6*U)                                                                        , // Al2Si2O5(OH)4
3285
-		Alunite                 = oredustelec( 9162, "Alunite"                   , SET_METALLIC  , 225, 180,  65, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,15*U, KOH              , 6*U, SO3              ,16*U, H2O              ,15*U, O                , 9*U)                        , // KAl3(SO4)2(OH)6
3286 3285
 		Kyanite                 = oredustelec( 9166, "Kyanite"                   , SET_FLINT     , 110, 110, 250, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          , 5*U, SiO2             , 3*U)                                                                                                , // Al2SiO5
3286
+		Alunite                 = oredustelec( 9162, "Alunite"                   , SET_METALLIC  , 225, 180,  65, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,15*U, KOH              , 6*U, SO3              ,16*U, H2O              ,15*U, O                , 9*U)                        , // KAl3(SO4)2(OH)6
3287 3287
 		
3288 3288
 		BasalticMineralSand     = oredustcent( 9003, "Basaltic Mineral Sand"     , SET_SAND      ,  40,  50,  40, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 0, Magnetite      , 1*U, Gabbro           , 1*U)                                                                                                .aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
3289 3289
 		GraniticMineralSand     = oredustcent( 9004, "Granitic Mineral Sand"     , SET_SAND      ,  40,  60,  60, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .setMcfg( 0, Magnetite      , 1*U, Granite          , 1*U)                                                                                                .aspects(TC.METALLUM, 2, TC.MAGNETO, 1),

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

@@ -741,8 +741,8 @@ public class LoaderItemList implements Runnable {
741 741
 		IL.TC_Silverwood_Log                    .set(ST.make(MD.TC, "blockMagicalLog"                       , 1, 1), new OreDictItemData(MT.Silverwood, U * 8, MT.Bark, U), OD.logWood);
742 742
 		IL.TC_Greatwood_Planks                  .set(ST.make(MD.TC, "blockWoodenDevice"                     , 1, 6), new OreDictItemData(MT.Greatwood , U), OP.plank.dat(MT.Greatwood));
743 743
 		IL.TC_Silverwood_Planks                 .set(ST.make(MD.TC, "blockWoodenDevice"                     , 1, 7), new OreDictItemData(MT.Silverwood, U), OP.plank.dat(MT.Silverwood));
744
-		IL.TC_Greatwood_Sapling                 .set(ST.make(MD.TC, "blockCustomPlant"                      , 1, 0), new OreDictItemData(MT.Greatwood , U2));
745
-		IL.TC_Silverwood_Sapling                .set(ST.make(MD.TC, "blockCustomPlant"                      , 1, 1), new OreDictItemData(MT.Silverwood, U2));
744
+		IL.TC_Greatwood_Sapling                 .set(ST.make(MD.TC, "blockCustomPlant"                      , 1, 0), new OreDictItemData(MT.Greatwood , U2), OP.treeSapling);
745
+		IL.TC_Silverwood_Sapling                .set(ST.make(MD.TC, "blockCustomPlant"                      , 1, 1), new OreDictItemData(MT.Silverwood, U2), OP.treeSapling);
746 746
 		IL.TC_Shimmerleaf                       .set(ST.make(MD.TC, "blockCustomPlant"                      , 1, 2), new OreDictItemData(MT.Hg, U), "flowerShimmerleaf");
747 747
 		IL.TC_Cinderpearl                       .set(ST.make(MD.TC, "blockCustomPlant"                      , 1, 3), new OreDictItemData(MT.Blaze, U9), "flowerCinderpearl");
748 748
 		IL.TC_Vishroom                          .set(ST.make(MD.TC, "blockCustomPlant"                      , 1, 5));

+ 2
- 2
src/main/java/gregapi/recipes/maps/RecipeMapCrucible.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
  *
@@ -56,6 +56,6 @@ public class RecipeMapCrucible extends RecipeMapSpecialSingleInput {
56 56
 		for (OreDictMaterialStack tMaterial : tList) tIngots.add(OM.ingotOrDust(tMaterial.mMaterial, tMaterial.mAmount));
57 57
 		
58 58
 		if (tIngots.isEmpty()) return null;
59
-		return RM.CrucibleSmelting.addFakeRecipe(F, ST.array(aInput), tIngots.toArray(ZL_IS), null, null, null, null, 0, 0, aData.mMaterial.mMaterial.mMeltingPoint);
59
+		return RM.CrucibleSmelting.addFakeRecipe(F, ST.array(ST.amount(1, aInput)), tIngots.toArray(ZL_IS), null, null, null, null, 0, 0, aData.mMaterial.mMaterial.mMeltingPoint);
60 60
 	}
61 61
 }

+ 1
- 1
src/main/java/gregtech/tileentity/multiblocks/MultiTileEntityLogisticsCore.java View File

@@ -668,7 +668,7 @@ public class MultiTileEntityLogisticsCore extends TileEntityBase10MultiBlockBase
668 668
 		if (isServerSide() && aPlayer != null && checkStructure(F)) {
669 669
 			List<String> tChat = new ArrayListNoNulls<>();
670 670
 			tChat.add("Power: " + mEnergy + " EU");
671
-			tChat.add("Comsumption: " + (20+mCPU_Logic+mCPU_Control+mCPU_Storage+mCPU_Conversion) + "+ EU/t");
671
+			tChat.add("Comsumption: " + (20+mCPU_Logic+mCPU_Control+mCPU_Storage+mCPU_Conversion) + " EU/t, plus more per moved Item/Fluid");
672 672
 			tChat.add(mCPU_Logic + " Logic Processors");
673 673
 			tChat.add(mCPU_Control + " Control Processors (Range: "+(2+mCPU_Control)+"m, Cubic AoE)");
674 674
 			tChat.add(mCPU_Storage + " Storage Processors (Note: For now useless)");

Loading…
Cancel
Save