Browse Source

Fixed Fusion Reactor exploit, Paper Mortaring and added some QwerTech Default Configs to the Default Config Pack

Gregorius Techneticies 9 months ago
parent
commit
1e83ba199f
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 4C7DC365E9F99806

+ 8
- 0
.defaultconfigs/config/gregtech/QwerTech.cfg View File

@@ -0,0 +1,8 @@
1
+# Configuration file
2
+
3
+recipes {
4
+    B:AllHammerRecipes=false
5
+    B:ElectrolyzeChemicalX=false
6
+    B:PutPlateHammeringBackInCraftingTable=true
7
+    S:RemoveCrafting=true
8
+}

+ 8
- 0
.defaultconfigs/config/gregtech/qwertech.cfg View File

@@ -0,0 +1,8 @@
1
+# Configuration file
2
+
3
+recipes {
4
+    B:AllHammerRecipes=false
5
+    B:ElectrolyzeChemicalX=false
6
+    B:PutPlateHammeringBackInCraftingTable=true
7
+    S:RemoveCrafting=true
8
+}

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

@@ -1117,7 +1117,7 @@ public class Loader_MultiTileEntities implements Runnable {
1117 1117
 		aMat = MT.TungstenSteel;        aRegistry.add("Large Shredder"                                      , "Multiblock Machines", 17109, 17101, MultiTileEntityShredder.class            , 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_TEXTURE, "largeshredder"           , NBT_INPUT,  512, NBT_INPUT_MIN,  512, NBT_INPUT_MAX,     4096, NBT_EFFICIENCY,  5000, NBT_ENERGY_ACCEPTED, TD.Energy.RU, NBT_RECIPEMAP, RM.Shredder             , NBT_INV_SIDE_AUTO_OUT, SIDE_BOTTOM, NBT_TANK_SIDE_AUTO_OUT, SIDE_BOTTOM, NBT_CHEAP_OVERCLOCKING, T, NBT_PARALLEL,  64, NBT_PARALLEL_DURATION, T                          ), "SGS", "GSG", "RMC", 'M', aRegistry.getItem(18003), 'R', IL.Processor_Crystal_Ruby, 'C', OD_CIRCUITS[6], 'G', OP.gearGt.dat(aMat), 'S', OP.gearGtSmall.dat(aMat));
1118 1118
 		aMat = MT.Pb;                   aRegistry.add("Large Matter Fabricator"                             , "Multiblock Machines", 17199, 17101, MultiTileEntityMatterFabricator.class    , 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_TEXTURE, "largemassfab"            , NBT_INPUT,    1, NBT_INPUT_MIN,    1, NBT_INPUT_MAX,  2097152                       , NBT_ENERGY_ACCEPTED, TD.Energy.QU, NBT_RECIPEMAP, RM.Massfab              , NBT_INV_SIDE_AUTO_OUT, SIDE_BOTTOM, NBT_TANK_SIDE_AUTO_OUT, SIDE_BOTTOM, NBT_CHEAP_OVERCLOCKING, T, NBT_PARALLEL,  64, NBT_PARALLEL_DURATION, T, NBT_NO_CONSTANT_POWER, T), "FFF", "FMF", "FFF", 'M', aRegistry.getItem(18031), 'F', IL.FIELD_GENERATORS[5]);
1119 1119
 		
1120
-		aMat = MT.SteelGalvanized;      aRegistry.add("Fusion Reactor"                                      , "Multiblock Machines", 17198, 17101, MultiTileEntityFusionReactor.class       , 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_TEXTURE, "fusionreactor"           , NBT_INPUT, 8192, NBT_INPUT_MIN,    1, NBT_INPUT_MAX,    16384                       , NBT_ENERGY_ACCEPTED, TD.Energy.TU, NBT_RECIPEMAP, RM.Fusion               , NBT_ENERGY_ACCEPTED_2, TD.Energy.LU, NBT_ENERGY_EMITTED, TD.Energy.EU, NBT_SPECIAL_IS_START_ENERGY, T), "FFF", "FMF", "FFF", 'M', aRegistry.getItem(18003), 'F', IL.FIELD_GENERATORS[5]);
1120
+		aMat = MT.SteelGalvanized;      aRegistry.add("Fusion Reactor"                                      , "Multiblock Machines", 17198, 17101, MultiTileEntityFusionReactor.class       , 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_TEXTURE, "fusionreactor"           , NBT_INPUT, 8192, NBT_INPUT_MIN,    1, NBT_INPUT_MAX,    16384                       , NBT_ENERGY_ACCEPTED, TD.Energy.TU, NBT_RECIPEMAP, RM.Fusion               , NBT_ENERGY_ACCEPTED_2, TD.Energy.LU, NBT_ENERGY_EMITTED, TD.Energy.EU, NBT_SPECIAL_IS_START_ENERGY, T, NBT_NO_CONSTANT_POWER, T), "FFF", "FMF", "FFF", 'M', aRegistry.getItem(18003), 'F', IL.FIELD_GENERATORS[5]);
1121 1121
 		
1122 1122
 		aMat = MT.StainlessSteel;       aRegistry.add("Stainless Steel Boiler Main Barometer"               , "Multiblock Machines", 17201, 17101, MultiTileEntityLargeBoiler.class         , 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_TEXTURE, "largeboiler"             , NBT_DESIGN, 18022, NBT_CAPACITY,  40960000, NBT_CAPACITY_SU,  40960000, NBT_OUTPUT_SU,  4096*STEAM_PER_EU), "PPh", "PMP", "wPP", 'M', aRegistry.getItem(18022), 'P', OP.plateDense.dat(aMat));
1123 1123
 		aMat = MT.Invar;                aRegistry.add("Invar Boiler Main Barometer"                         , "Multiblock Machines", 17205, 17101, MultiTileEntityLargeBoiler.class         , 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_TEXTURE, "largeboiler"             , NBT_DESIGN, 18027, NBT_CAPACITY,  40960000, NBT_CAPACITY_SU,  40960000, NBT_OUTPUT_SU,  4096*STEAM_PER_EU), "PPh", "PMP", "wPP", 'M', aRegistry.getItem(18027), 'P', OP.plateDense.dat(aMat));

+ 14
- 6
src/main/java/gregtech/loaders/b/Loader_OreProcessing.java View File

@@ -242,17 +242,25 @@ public class Loader_OreProcessing implements Runnable {
242 242
 			}
243 243
 		}
244 244
 	}
245
-
245
+	
246 246
 	public static class RecyclingProcessing implements IOreDictListenerRecyclable {
247 247
 		@Override
248 248
 		public void onRecycleableRegistration(OreDictRecyclingContainer aEvent) {
249
-			if (aEvent.mItemData == null || ST.container(aEvent.mStack, T) != null || (aEvent.mItemData.mPrefix != null && aEvent.mItemData.mPrefix.containsAny(ORE_PROCESSING_DIRTY, ORE))) return;
249
+			if (aEvent.mItemData == null || ST.container(aEvent.mStack, T) != null) return;
250 250
 			
251 251
 			List<OreDictMaterialStack> tList = new ArrayListNoNulls<>();
252
-			for (OreDictMaterialStack tMaterial : aEvent.mItemData.getAllMaterialStacks()) {
253
-				if (tMaterial.mMaterial == MT.Paper) RM.Mortar.addRecipe1(T, 16, 16, aEvent.mStack, OM.dust(tMaterial));
254
-				if (tMaterial.mMaterial.mTargetSmelting.mAmount > 0 && tMaterial.mMaterial.contains(MELTING) && !tMaterial.mMaterial.contains(BLACKLISTED_SMELTER)) OM.stack(UT.Code.units(tMaterial.mAmount, U, tMaterial.mMaterial.mTargetSmelting.mAmount, F), tMaterial.mMaterial.mTargetSmelting.mMaterial).addToList(tList);
252
+			if (aEvent.mItemData.mPrefix == null) {
253
+				for (OreDictMaterialStack tMaterial : aEvent.mItemData.getAllMaterialStacks()) {
254
+					if (tMaterial.mMaterial == MT.Paper && tMaterial.mAmount >= OP.dustDiv72.mAmount) RM.Mortar.addRecipe1(T, 16, 16, aEvent.mStack, OM.dust(tMaterial.mMaterial, tMaterial.mAmount));
255
+					if (tMaterial.mMaterial.mTargetSmelting.mAmount > 0 && tMaterial.mMaterial.contains(MELTING) && !tMaterial.mMaterial.contains(BLACKLISTED_SMELTER)) OM.stack(UT.Code.units(tMaterial.mAmount, U, tMaterial.mMaterial.mTargetSmelting.mAmount, F), tMaterial.mMaterial.mTargetSmelting.mMaterial).addToList(tList);
256
+				}
257
+			} else {
258
+				if (aEvent.mItemData.mPrefix.containsAny(ORE_PROCESSING_DIRTY, ORE)) return;
259
+				for (OreDictMaterialStack tMaterial : aEvent.mItemData.getAllMaterialStacks()) {
260
+					if (tMaterial.mMaterial.mTargetSmelting.mAmount > 0 && tMaterial.mMaterial.contains(MELTING) && !tMaterial.mMaterial.contains(BLACKLISTED_SMELTER)) OM.stack(UT.Code.units(tMaterial.mAmount, U, tMaterial.mMaterial.mTargetSmelting.mAmount, F), tMaterial.mMaterial.mTargetSmelting.mMaterial).addToList(tList);
261
+				}
255 262
 			}
263
+			
256 264
 			if (tList.isEmpty()) return;
257 265
 			
258 266
 			FluidStack tFluid = null;
@@ -271,7 +279,7 @@ public class Loader_OreProcessing implements Runnable {
271 279
 			}
272 280
 		}
273 281
 	}
274
-
282
+	
275 283
 	public static class RecyclingProcessingCrucibleFakeRecipes implements IOreDictListenerRecyclable {
276 284
 		@Override
277 285
 		public void onRecycleableRegistration(OreDictRecyclingContainer aEvent) {

Loading…
Cancel
Save