aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-02-05 20:02:33 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-02-05 20:02:33 +0000
commit5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b (patch)
tree7e4439b8b7a4d60efc65d6d6aee925c017a0c626 /src/Java
parent6770cc2c03d06ddbb59d993d4f157b3ad02e1d35 (diff)
downloadGT5-Unofficial-5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b.tar.gz
GT5-Unofficial-5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b.tar.bz2
GT5-Unofficial-5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b.zip
+ Added recipe for Nano Healer.
+ Added recipe for Strange Dust. + Added recipe for Slow Builders Ring. + Added recipes for Charge Packs. + Added recipes to make obtaining Zirconium a little earlier. + Added packager recipes for all ore materials. + Added lathe recipes for all materials -> rods. Closes #411. + Added way to process Silicon Carbide into Synthetic Graphite. Closes #407. + Added proper achievement localization for all new AL recipes. + Added more INIT_PHASE's. - Removed ways to obtain Trinium dust in GTNH. (Leave handling to GT instead). % Adjusted recipes for Cyclotron and Casings, it's now assembled instead of shape crafted. % Adjusted circuits used in lower tier dehydrator recipes for consistency. Closes #364. % Adjusted a few materials having '-' in their name within en_US.lang. % Adjusted power capacity of the Gem Batteries. % Adjusted tiering for Large Auto-Assembler, it has been reduced by one. % Adjusted composition of Pikyonium to now require Yttrium, instead of the rare Ytterbium. % Adjusted composition of DEEP_EARTH_REACTOR_FUEL_DEPOSIT to be slightly more balanced. % Adjusted smelting point of Zirconium Carbide. $ Fixed an NPE in GeneralTooltipEventHandler.java. $ Fixed weird invisible recipes. Closes #304. $ Confirmed Large Mixer is now working correctly. Closes #366. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/918d763dabd82d47db739a1b0a51c01f0803adc0). $ Confirmed Matter Fabricator is now working correctly. Closes #360. + Auto Doors. Closes #338. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/22c6a05a8a3a00294bcb8890a1e2a0fdc9196de8). % Changed Energy Buffer Recipes. Closes #52. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/499411aa21ac4a742b6d51ef3ce9c4046d0a22c1). $ Invalid Recipe. Closes #241. (Closed in unknown, previous commit).
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java6
-rw-r--r--src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java11
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java30
-rw-r--r--src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java4
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java6
-rw-r--r--src/Java/gtPlusPlus/core/material/ORES.java16
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java174
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_General.java183
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java306
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java9
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java7
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java28
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java6
15 files changed, 522 insertions, 274 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 79a3bee7ba..1c4789c28b 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -74,7 +74,9 @@ public class GTplusplus implements ActionListener {
SUPER(null),
PRE_INIT(SUPER),
INIT(PRE_INIT),
- POST_INIT(INIT);
+ POST_INIT(INIT),
+ SERVER_START(POST_INIT),
+ STARTED(SERVER_START);
protected boolean mIsPhaseActive = false;
private final INIT_PHASE mPrev;
@@ -226,6 +228,7 @@ public class GTplusplus implements ActionListener {
@EventHandler
public synchronized void serverStarting(final FMLServerStartingEvent event) {
+ INIT_PHASE.SERVER_START.setPhaseActive(true);
mChunkLoading.serverStarting(event);
event.registerServerCommand(new CommandMath());
event.registerServerCommand(new CommandDebugChunks());
@@ -259,6 +262,7 @@ public class GTplusplus implements ActionListener {
*/
@Mod.EventHandler
public void onLoadComplete(FMLLoadCompleteEvent event) {
+ INIT_PHASE.STARTED.setPhaseActive(true);
proxy.onLoadComplete(event);
generateGregtechRecipeMaps();
}
diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index 6c940371b3..6d09f65f3f 100644
--- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -7,6 +7,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import gregtech.api.enums.ItemList;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.GTplusplus.INIT_PHASE;
import gtPlusPlus.core.handler.events.BlockEventHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -22,8 +24,13 @@ public class GeneralTooltipEventHandler {
@SubscribeEvent
public void onItemTooltip(ItemTooltipEvent event){
+
+ if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED) {
+ return;
+ }
+
if (CORE.ConfigSwitches.chanceToDropFluoriteOre > 0) {
- if (!BlockEventHandler.blockLimestone.isEmpty()) {
+ if (BlockEventHandler.blockLimestone != null && !BlockEventHandler.blockLimestone.isEmpty()) {
for (ItemStack h : BlockEventHandler.blockLimestone) {
if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) {
if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
@@ -32,7 +39,7 @@ public class GeneralTooltipEventHandler {
}
}
}
- if (!BlockEventHandler.oreLimestone.isEmpty()) {
+ if (BlockEventHandler.oreLimestone != null && !BlockEventHandler.oreLimestone.isEmpty()) {
for (ItemStack h : BlockEventHandler.oreLimestone) {
if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) {
if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
index b6a5dff2ac..eaa0905c93 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
@@ -14,22 +14,36 @@ public class BaseItemRod extends BaseItemComponent{
public BaseItemRod(final Material material) {
super(material, BaseItemComponent.ComponentTypes.ROD);
this.addExtruderRecipe();
+ this.addLatheRecipe();
}
private void addExtruderRecipe(){
Logger.WARNING("Adding cutter recipe for "+this.materialName+" Rods");
-
final ItemStack stackStick = this.componentMaterial.getRod(1);
final ItemStack stackBolt = this.componentMaterial.getBolt(4);
-
+
if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackBolt}))
- GT_Values.RA.addCutterRecipe(
- stackStick,
- stackBolt,
- null,
- (int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
- 4);
+ GT_Values.RA.addCutterRecipe(
+ stackStick,
+ stackBolt,
+ null,
+ (int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
+ 4);
+ }
+
+
+ private void addLatheRecipe(){
+ Logger.WARNING("Adding recipe for "+this.materialName+" Rod");
+ ItemStack boltStack = this.componentMaterial.getIngot(1);
+ if (ItemUtils.checkForInvalidItems(boltStack)){
+ GT_Values.RA.addLatheRecipe(
+ boltStack,
+ ItemUtils.getSimpleStack(this),
+ null,
+ (int) Math.max(this.componentMaterial.getMass() / 8L, 1L),
+ 4);
+ }
}
}
diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
index af74c1d535..29e525ed10 100644
--- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
@@ -18,8 +18,8 @@ public class BaseItemScrew extends BaseItemComponent{
private void addLatheRecipe(){
Logger.WARNING("Adding recipe for "+this.materialName+" Screws");
- final ItemStack boltStack = ItemUtils.getItemStackOfAmountFromOreDict(this.unlocalName.replace("itemScrew", "bolt"), 1);
- if (null != boltStack){
+ ItemStack boltStack = this.componentMaterial.getBolt(1);
+ if (ItemUtils.checkForInvalidItems(boltStack)){
GT_Values.RA.addLatheRecipe(
boltStack,
ItemUtils.getSimpleStack(this),
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index c7397962ad..4edd36c51f 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -524,11 +524,11 @@ public final class ALLOY {
"Zirconium Carbide", //Material Name
MaterialState.SOLID, //State
new short[]{222, 202, 180, 0}, //Material Colour
- 1855, //Melting Point in C
+ 1555, //Melting Point in C
-1,
-1,
-1,
- true, //Uses Blast furnace?
+ false, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50),
@@ -787,7 +787,7 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
new MaterialStack(ALLOY.TUNGSTENSTEEL, 8)
});
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index a8b86a142c..801e4924b3 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -807,15 +807,15 @@ public final class ORES {
-1,
4, //Radiation
new MaterialStack[]{// Na3AlF6
- new MaterialStack(ELEMENT.getInstance().RADON, 3),
- new MaterialStack(ELEMENT.getInstance().RADIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().RADON, 2),
+ new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
- new MaterialStack(ELEMENT.getInstance().URANIUM238, 13),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 28),
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 5),
- new MaterialStack(FLUORCAPHITE, 4),
- new MaterialStack(SAMARSKITE_Y, 6),
- new MaterialStack(TITANITE, 2)
+ new MaterialStack(ELEMENT.getInstance().URANIUM238, 10),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 25),
+ new MaterialStack(ELEMENT.getInstance().THORIUM232, 4),
+ new MaterialStack(FLUORCAPHITE, 6),
+ new MaterialStack(SAMARSKITE_Y, 8),
+ new MaterialStack(TITANITE, 4)
});
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 72781e3e7f..9d34aa371d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -22,6 +22,7 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.material.ORES;
import gtPlusPlus.core.material.Particle;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
@@ -122,6 +123,18 @@ public class RECIPES_GREGTECH {
private static void assemblyLineRecipes() {
+
+
+ ItemStack[] aCoilWire = new ItemStack[] {
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 48 : 16),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 32 : 8),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 16 : 4),
+ };
+
+
+
+
//Containment Casings
CORE.RA.addAssemblylineRecipe(
ItemList.Field_Generator_IV.get(1),
@@ -139,7 +152,8 @@ public class RECIPES_GREGTECH {
CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32),
CI.getTieredComponent(OrePrefixes.circuit, 6, GTNH ? 32 : 16),
CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8),
- GregtechItemList.Laser_Lens_Special.get(1)
+ GregtechItemList.Laser_Lens_Special.get(1),
+ aCoilWire[3]
},
new FluidStack[] {
ALLOY.NITINOL_60.getFluid(144 * 9 * (GTNH ? 4 : 2)),
@@ -191,6 +205,7 @@ public class RECIPES_GREGTECH {
CI.getTieredComponent(OrePrefixes.pipeHuge, 5, GTNH ? 16 : 4),
CI.getTieredComponent(OrePrefixes.cableGt08, 7, GTNH ? 32 : 16),
CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 8 : 4),
+ aCoilWire[2]
},
new FluidStack[] {
CI.getTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)),
@@ -230,6 +245,7 @@ public class RECIPES_GREGTECH {
CI.getTieredComponent(OrePrefixes.circuit, j-2, GTNH ? 16 : 8),
CI.getTieredComponent(OrePrefixes.cableGt08, j+1, GTNH ? 32 : 16),
CI.getTieredComponent(OrePrefixes.gearGt, j-1, GTNH ? 8 : 4),
+ aCoilWire[aCasingSlot]
},
new FluidStack[] {
CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)),
@@ -285,6 +301,93 @@ public class RECIPES_GREGTECH {
}
+ //Nano Healer
+ CORE.RA.addAssemblylineRecipe(
+ ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1),
+ 20 * 60 * 10,
+ new ItemStack[] {
+ ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
+ CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+ CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4),
+ CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
+ CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12),
+ CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6),
+ aCoilWire[3]
+ },
+ new FluidStack[] {
+ CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+
+ },
+ ItemUtils.getItemStack("miscutils:personalHealingDevice", 1),
+ 20 * 60 * 30 * (GTNH ? 2 : 1),
+ (int) GT_Values.V[7]);
+
+
+
+ //Charge Pack LuV-UV
+
+ ItemStack[] aChargeResearch = new ItemStack[] {
+ ItemUtils.getItemStack("miscutils:item.itemBufferCore7", 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack1, 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack2, 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack3, 1),
+ };
+
+ ItemStack[] aChargeOutputs = new ItemStack[] {
+ ItemUtils.getSimpleStack(ModItems.itemChargePack1, 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack2, 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack3, 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack4, 1),
+ };
+
+ ItemStack[] aBufferCoreInputs = new ItemStack[] {
+ ItemUtils.getItemStack("miscutils:item.itemBufferCore7", GTNH ? 8 : 4),
+ ItemUtils.getItemStack("miscutils:item.itemBufferCore8", GTNH ? 8 : 4),
+ ItemUtils.getItemStack("miscutils:item.itemBufferCore9", GTNH ? 8 : 4),
+ ItemUtils.getItemStack("miscutils:item.itemBufferCore10", GTNH ? 8 : 4),
+ };
+
+ int aCurrSlot = 0;
+ for (int h = 6; h < 10; h++) {
+ CORE.RA.addAssemblylineRecipe(
+ aChargeResearch[aCurrSlot],
+ 20 * 60 * 10 * (aCurrSlot + 1),
+ new ItemStack[] {
+ ItemUtils.getSimpleStack(
+ aGemBatteries[aCurrSlot], GTNH ? 4 : 2),
+ aBufferCoreInputs[aCurrSlot],
+ aCoilWire[aCurrSlot],
+ CI.getTieredComponent(OrePrefixes.plate, h, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.plate, h-1, GTNH ? 32 : 16),
+ CI.getTieredComponent(OrePrefixes.circuit, h, GTNH ? 16 : 4),
+ CI.getTieredComponent(OrePrefixes.circuit, h-1, GTNH ? 32 : 8),
+ CI.getTieredComponent(OrePrefixes.cableGt12, h-1, GTNH ? 32 : 16),
+ CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.bolt, h-2, GTNH ? 32 : 16),
+ CI.getElectricMotor(h, GTNH ? 8 : 4),
+ CI.getFieldGenerator(h-1, 2),
+ CI.getRobotArm(h-2, GTNH ? 4 : 2),
+ },
+ new FluidStack[] {
+ CI.getTieredFluid(h, 144 * 18 * (GTNH ? 8 : 4)),
+ CI.getTertiaryTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
+ CI.getAlternativeTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
+ CI.getAlternativeTieredFluid(h-2, 144 * 18 * (GTNH ? 8 : 4)),
+ },
+ aChargeOutputs[aCurrSlot],
+ 20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot+1),
+ (int) GT_Values.V[h]);
+ aCurrSlot++;
+ }
+
+
+
+
@@ -1454,11 +1557,33 @@ public class RECIPES_GREGTECH {
}
private static void blastFurnaceRecipes() {
+
+ //public boolean addBlastRecipe(
+ //ItemStack aInput1, ItemStack aInput2,
+ //FluidStack aFluidInput, FluidStack aFluidOutput,
+ //ItemStack aOutput1, ItemStack aOutput2,
+ //int aDuration, int aEUt, int aLevel)
+
GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2),
ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1), GT_Values.NF, GT_Values.NF,
ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3), null, 60 * 20, 2000, 3000);
GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1), null, GT_Values.NF,
GT_Values.NF, ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1), null, 60 * 20, 340, 300);
+
+
+ //Synthetic Graphite
+ GT_Values.RA.addBlastRecipe(
+ CI.getNumberedCircuit(22),
+ ALLOY.SILICON_CARBIDE.getDust(16),
+ ELEMENT.getInstance().NITROGEN.getFluid(4000),
+ GT_Values.NF,
+ ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSilicon", 8),
+ 60 * 20,
+ MaterialUtils.getVoltageForTier(GTNH ? 5 : 4),
+ 4500);
+
+
}
private static void autoclaveRecipes() {
@@ -1817,6 +1942,30 @@ public class RECIPES_GREGTECH {
15000);
+ //Create Strange Dust
+ CORE.RA.addCyclotronRecipe(
+ new ItemStack[] {
+ ELEMENT.getInstance().PLUTONIUM238.getDust(1),
+ Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN),
+ },
+ FluidUtils.getWildcardFluidStack("ender", 1000),
+ new ItemStack[] {
+ ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1)
+ },
+ null,
+ new int[] { 2500 },
+ 20 * 60 * 15,
+ (int) GT_Values.V[7],
+ 15000);
+
+
@@ -1891,7 +2040,23 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1),
ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1), new int[] { 10000, 2500, 4000 },
20 * 20, 24);
+ // Zircon
+ GT_Values.RA.addElectromagneticSeparatorRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMagnetite", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), new int[] { 10000, 1250, 2500 },
+ 20 * 20, 24);
+ GT_Values.RA.addElectromagneticSeparatorRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), new int[] { 10000, 1250, 2500 },
+ 20 * 20, 24);
+
+
+ if (!GTNH) {
// Trinium
GT_Values.RA.addElectromagneticSeparatorRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedNaquadah", 1),
@@ -1914,7 +2079,12 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), new int[] { 10000, 3000, 3000 },
- 20 * 20, 24);
+ 20 * 20, 24);
+ }
+
+
+
+
}
private static void advancedMixerRecipes() {
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 976cf20703..500333a7a2 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -16,6 +16,7 @@ import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
@@ -159,27 +160,27 @@ public class RECIPES_General {
}
}
-
+
//Shaped Crafting for ULV Material Dusts
//Potin
if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {"dustLead", "dustBronze", "dustTin",
- "dustLead", "dustBronze"}, ALLOY.POTIN.getDust(5))){
+ "dustLead", "dustBronze"}, ALLOY.POTIN.getDust(5))){
Logger.INFO("Added shapeless recipe for Potin Dust.");
}
//Tumbaga
if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {"dustRoseGold", "dustGold", "dustGold",
"dustGold", "dustCopper", "dustCopper"}, ALLOY.TUMBAGA.getDust(10))){
- Logger.INFO("Added shapeless recipe for Tumbaga Dust.");
- }
-
-
-
-
-
-
-
-
-
+ Logger.INFO("Added shapeless recipe for Tumbaga Dust.");
+ }
+
+
+
+
+
+
+
+
+
//Mining Explosive
Logger.RECIPE("[Inspection] Explosives");
if (RecipeUtils.recipeBuilder(
@@ -268,7 +269,19 @@ public class RECIPES_General {
ItemUtils.getSimpleStack(ModBlocks.blockNet, 2))){
Logger.INFO("Added a recipe for Nets.");
}
-
+
+ // Slow Builders Ring
+ CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { ItemUtils.getSimpleStack(Blocks.ice, 8),
+ ItemUtils.getSimpleStack(ModBlocks.blockNet, 8), ItemUtils.getSimpleStack(Blocks.vine, 8),
+ ALLOY.TUMBAGA.getRing(1), },
+ FluidUtils.getWater(1000), // Fluid
+ ItemUtils.getItemStack("miscutils:SlowBuildingRing", 1), // Output
+ 20 * 30, // Dur
+ 16); // Eu
+
+
+
}
@@ -300,8 +313,8 @@ public class RECIPES_General {
input, input, input,
input, input, input,
output)){
- Logger.INFO("Added a recipe for Compressed Obsidian ["+r+"]");
- }
+ Logger.INFO("Added a recipe for Compressed Obsidian ["+r+"]");
+ }
if (RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{output}, ItemUtils.getSimpleStack(input, 9))){
Logger.INFO("Added a shapeless recipe for Compressed Obsidian ["+r+"]");
@@ -310,52 +323,52 @@ public class RECIPES_General {
}
return true;
}
-
+
private static void addHandPumpRecipes() {
if (RecipeUtils.recipeBuilder(
CI.electricPump_LV, "circuitBasic", null,
"ringBrass", CI.electricMotor_LV, "circuitBasic",
"plateSteel", "plateSteel", "rodBrass",
ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1)))
- Logger.INFO("Added recipe for Hand Pump I - true");
+ Logger.INFO("Added recipe for Hand Pump I - true");
if (RecipeUtils.recipeBuilder(
CI.electricPump_MV, "circuitAdvanced", null,
"ringMagnalium", CI.electricMotor_MV, "circuitAdvanced",
"plateAluminium", "plateAluminium", "rodMagnalium",
ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1)))
- Logger.INFO("Added recipe for Hand Pump II - true");
+ Logger.INFO("Added recipe for Hand Pump II - true");
if (RecipeUtils.recipeBuilder(
CI.electricPump_HV, "circuitData", null,
"ringChrome", CI.electricMotor_HV, "circuitData",
"plateStainlessSteel", "plateStainlessSteel", "rodChrome",
ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1)))
- Logger.INFO("Added recipe for Hand Pump III - true");
+ Logger.INFO("Added recipe for Hand Pump III - true");
if (RecipeUtils.recipeBuilder(
CI.electricPump_EV, "circuitElite", null,
"ringTitanium", CI.electricMotor_EV, "circuitElite",
"plateTungstenSteel", "plateTungstenSteel", "rodTitanium",
ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1)))
- Logger.INFO("Added recipe for Hand Pump IV - true");
-
-
-
+ Logger.INFO("Added recipe for Hand Pump IV - true");
+
+
+
GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1), 30, 30);
GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1), 120, 120);
GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1), 480, 480);
GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1), 1820, 1820);
-
-
+
+
}
-
+
private static void migratedRecipes() {
-
+
RecipeUtils.generateMortarRecipe(ItemUtils.getSimpleStack(ModItems.itemPlateRawMeat), ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1));
-
+
generateWireRecipes(ELEMENT.getInstance().ZIRCONIUM);
generateWireRecipes(ALLOY.HG1223);
generateWireRecipes(ALLOY.LEAGRISIUM);
generateWireRecipes(ALLOY.TRINIUM_TITANIUM);
-
+
GT_Materials[] g = new GT_Materials[] {
GT_Materials.Staballoy,
GT_Materials.Tantalloy60,
@@ -368,7 +381,7 @@ public class RECIPES_General {
GT_Materials.Inconel792,
GT_Materials.HastelloyX,
GT_Materials.TriniumNaquadahCarbonite,
-
+
};
for (GT_Materials e : g) {
if (e == GT_Materials.Void) {
@@ -379,16 +392,16 @@ public class RECIPES_General {
int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 64 : 16;
generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
}
-
+
Materials[] h = new Materials[] {
Materials.Europium,
Materials.Tungsten,
Materials.DarkSteel,
Materials.Clay,
Materials.Lead,
-
+
};
-
+
for (Materials e : h) {
if (e == Materials.DarkSteel) {
if (!LoadedMods.EnderIO) {
@@ -398,13 +411,13 @@ public class RECIPES_General {
int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 64 : 16;
generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
}
-
+
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK)
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[4], "rotorGtStainlessSteel", CI.component_Plate[4],
- CI.getTieredCircuitOreDictName(3), CI.machineHull_HV, CI.getTieredCircuitOreDictName(3),
- CI.component_Plate[4], CI.electricPump_HV, CI.component_Plate[4],
- GregtechItemList.Hatch_Air_Intake.get(1L, new Object[0]));
+ RecipeUtils.addShapedGregtechRecipe(
+ CI.component_Plate[4], "rotorGtStainlessSteel", CI.component_Plate[4],
+ CI.getTieredCircuitOreDictName(3), CI.machineHull_HV, CI.getTieredCircuitOreDictName(3),
+ CI.component_Plate[4], CI.electricPump_HV, CI.component_Plate[4],
+ GregtechItemList.Hatch_Air_Intake.get(1L, new Object[0]));
RecipeUtils.addShapedGregtechRecipe(CI.component_Plate[6], ALLOY.MARAGING250.getGear(1), CI.component_Plate[6],
CI.getTieredCircuitOreDictName(4), GregtechItemList.Casing_AdvancedVacuum.get(1),
@@ -420,55 +433,55 @@ public class RECIPES_General {
CI.getTieredCircuitOreDictName(7), GregtechItemList.Casing_Naq_Reactor_A.get(1),
CI.getTieredCircuitOreDictName(7), CI.component_Plate[9], ItemList.Hatch_Input_ZPM.get(1),
CI.component_Plate[8], GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0]));
-
+
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_LV.get(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_MV.get(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_HV.get(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_EV.get(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_IV.get(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_LuV.get(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_ZPM.get(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_UV.get(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd,
- new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_MAX.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_LV.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_MV.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_HV.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_EV.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_IV.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_LuV.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_ZPM.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_UV.get(1) });
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), Character.valueOf('P'),
+ GregtechItemList.Pollution_Cleaner_MAX.get(1) });
}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 5b2a8c1300..e7577071c6 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/