aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java31
-rw-r--r--src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java42
-rw-r--r--src/main/java/com/github/technus/tectech/loader/RecipeLoader.java8
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationMessage.java10
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang2
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemConstructable.png (renamed from src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png)bin667 -> 667 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.pngbin686 -> 574 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.pngbin686 -> 571 bytes
9 files changed, 65 insertions, 32 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 1576bcd67a..6bc58ffe62 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -3,11 +3,13 @@ package com.github.technus.tectech.compatibility.dreamcraft;
import com.github.technus.tectech.recipe.TT_recipeAdder;
import com.github.technus.tectech.thing.CustomItemList;
import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_Centrifuge;
import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_ElectromagneticSeparator;
import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine;
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.interfaces.IItemContainer;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -43,7 +45,7 @@ public class DreamCraftRecipeLoader implements Runnable {
return (IItemContainer) Enum.valueOf(customItemList, name);
}
- private static void addAssemblerRecipe(ItemStack[] items, FluidStack fluid, ItemStack output, int time, int eut) {
+ private static void addAssemblerRecipeWithCleanroom(ItemStack[] items, FluidStack fluid, ItemStack output, int time, int eut) {
try {
addAssemblerRecipe.invoke(GT_Values.RA, items, fluid, output, time, eut, true);
} catch (Exception e) {
@@ -60,15 +62,10 @@ public class DreamCraftRecipeLoader implements Runnable {
GT_ModHandler.getIC2Item("reinforcedGlass", 1L)
}, getOrDefault("Trinium",Materials.Osmium).getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, 500000);
- //BLUEprint
- GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1),
- GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, Dyes.dyeWhite});
-
//region pipes
//Data
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
ItemList.Circuit_Parts_GlassFiber.get(8),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8)
}, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1), 200, 30720);
@@ -105,7 +102,7 @@ public class DreamCraftRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1)
}, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1), 100, 1920);
//Advanced Computer Casing
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
CustomItemList.eM_Computer_Casing.get(1),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64),
@@ -194,14 +191,14 @@ public class DreamCraftRecipeLoader implements Runnable {
//GT_Values.RA.addAssemblerRecipe(new ItemStack[]{com.dreammaster.gthandler.CustomItemList.WetTransformer_UMV_UIV.get(1), CustomItemList.eM_energymulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 6)}, Materials.Tungsten.getMolten(8000), CustomItemList.eM_energymulti64_UIV.get(1), 400, 8000000);
//Data Input
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
CustomItemList.eM_Computer_Casing.get(1),
ItemList.Hatch_Input_Bus_LuV.get(1),
ItemList.Circuit_Crystalcomputer.get(1),
CustomItemList.DATApipe.get(2)
}, Materials.Iridium.getMolten(1296), CustomItemList.dataIn_Hatch.get(1), 200, 122880);
//Data Output
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
CustomItemList.eM_Computer_Casing.get(1),
ItemList.Hatch_Output_Bus_LuV.get(1),
ItemList.Circuit_Crystalcomputer.get(1),
@@ -209,7 +206,7 @@ public class DreamCraftRecipeLoader implements Runnable {
}, Materials.Iridium.getMolten(1296), CustomItemList.dataOut_Hatch.get(1), 200, 122880);
//Rack
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
CustomItemList.eM_Computer_Bus.get(1),
ItemList.Hatch_Input_Bus_ZPM.get(1),
ItemList.Circuit_Crystalcomputer.get(2),
@@ -242,7 +239,7 @@ public class DreamCraftRecipeLoader implements Runnable {
new ItemStack(Blocks.stone_button, 16),
}, Materials.Iridium.getMolten(2592), CustomItemList.Parametrizer_Hatch.get(1), 800, 122880);
//Uncertainty
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
CustomItemList.eM_Computer_Casing.get(1),
ItemList.Circuit_Ultimatecrystalcomputer.get(1),
CustomItemList.DATApipe.get(16),
@@ -251,21 +248,21 @@ public class DreamCraftRecipeLoader implements Runnable {
}, Materials.Iridium.getMolten(2592), CustomItemList.Uncertainty_Hatch.get(1), 1200, 122880);
//Elemental Input
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
CustomItemList.eM_Containment.get(1),
ItemList.Hatch_Input_UV.get(1),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2),
ItemList.Sensor_UV.get(1)
}, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_in_UV.get(1), 800, 500000);
//Elemental Output
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
CustomItemList.eM_Containment.get(1),
ItemList.Hatch_Output_UV.get(1),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2),
ItemList.Emitter_UV.get(1)
}, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_out_UV.get(1), 800, 500000);
//Overflow
- addAssemblerRecipe(new ItemStack[]{
+ addAssemblerRecipeWithCleanroom(new ItemStack[]{
CustomItemList.eM_Containment.get(1),
ItemList.Hatch_Muffler_UV.get(1),
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1),
diff --git a/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
index 1510b40420..81583c1cb0 100644
--- a/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
@@ -3,11 +3,13 @@ package com.github.technus.tectech.loader;
import com.github.technus.tectech.recipe.TT_recipeAdder;
import com.github.technus.tectech.thing.CustomItemList;
import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_Centrifuge;
import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_ElectromagneticSeparator;
import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine;
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import net.minecraft.init.Blocks;
@@ -27,11 +29,6 @@ public class BloodyRecipeLoader implements Runnable {
GT_ModHandler.getIC2Item("reinforcedGlass", 1L)
}, Materials.Osmium.getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, 500000);
- //BLUEprint
- GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1),
- GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, Dyes.dyeWhite});
-
//region pipes
//Data
@@ -90,6 +87,37 @@ public class BloodyRecipeLoader implements Runnable {
ItemList.Field_Generator_IV.get(1)
}, Materials.Osmium.getMolten(1296), CustomItemList.eM_Containment.get(1), 800, 500000);
+ //Hollow Casing
+ TT_recipeAdder.addResearchableAssemblylineRecipe(CustomItemList.eM_Containment.get(1),
+ 12000,32, 500000, 6, new ItemStack[]{
+ CustomItemList.eM_Containment.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 2),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Plutonium, 2),
+ GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 8),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 16),
+ }, new FluidStack[]{
+ Materials.Americium.getMolten(1296),
+ Materials.Osmium.getMolten(1296),
+ new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+ Materials.Argon.getGas(576),
+ }, CustomItemList.eM_Hollow.get(2), 200, 2000000);
+
+ //EM Coil
+ TT_recipeAdder.addResearchableAssemblylineRecipe(CustomItemList.eM_Hollow.get(1),
+ 48000,128, 1000000, 16, new ItemStack[]{
+ CustomItemList.eM_Hollow.get(1),
+ ItemList.Casing_Fusion_Coil.get(4),
+ ItemList.Casing_Coil_NaquadahAlloy.get( 4),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16),
+ }, new FluidStack[]{
+ Materials.Glass.getMolten(2304),
+ Materials.Silicone.getMolten(1872),
+ new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+ Materials.Americium.getMolten(1296),
+ }, CustomItemList.eM_Coil.get(4), 800, 2000000);
+
//endregion
diff --git a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
index db323ee038..0299f96849 100644
--- a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
@@ -4,9 +4,12 @@ import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoade
import com.github.technus.tectech.elementalMatter.definitions.complex.atom.dAtomDefinition;
import com.github.technus.tectech.elementalMatter.definitions.complex.hadron.dHadronDefinition;
import com.github.technus.tectech.thing.casing.TT_Container_Casings;
+import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
import cpw.mods.fml.common.Loader;
+import gregtech.api.enums.Dyes;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import net.minecraft.item.ItemStack;
@@ -30,6 +33,11 @@ public class RecipeLoader implements Runnable {
RA.addAssemblerRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(i), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1)}, Materials.Aluminium.getMolten(864), new ItemStack(TT_Container_Casings.sHintCasingsTT, 1, i), 32, 120);
}
+ //BLUEprint
+ GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, Dyes.dyeWhite});
+
if (Loader.isModLoaded("dreamcraft")) {
new DreamCraftRecipeLoader().run();//init recipes for GTNH version
} else {
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
index 8e42e9a371..5b9db73126 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
@@ -36,8 +36,8 @@ public final class ConstructableTriggerItem extends Item {
private static HashMap<String,MultiblockInfoContainer> multiblockMap= new HashMap<>();
private ConstructableTriggerItem() {
- setUnlocalizedName("em.debugBuilder");
- setTextureName(MODID + ":itemDebugBuilder");
+ setUnlocalizedName("em.constructable");
+ setTextureName(MODID + ":itemConstructable");
}
@Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationMessage.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationMessage.java
index 21c64dfc6d..59b14c16ed 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationMessage.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationMessage.java
@@ -17,11 +17,11 @@ import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
public class RotationMessage implements IMessage {
- protected int mPosX;
- protected int mPosY;
- protected int mPosZ;
- protected int mPosD;
- protected int mRotF;
+ int mPosX;
+ int mPosY;
+ int mPosZ;
+ int mPosD;
+ int mRotF;
public RotationMessage() {
}
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 590a55ceaa..99c3e9181b 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -4,7 +4,7 @@ tile.quantumStuff.name=Quantum Stuff
item.em.debugContainer.name=Debug EM Container
item.em.definitionContainer.name=EM Recipe Hint
item.em.definitionScanStorage.name=EM Scan Storage
-item.em.debugBuilder.name=Multiblock Machine Blueprint
+item.em.constructable.name=Multiblock Machine Blueprint
item.em.frontRotate.name=Front Rotation Scrench
item.em.parametrizerMemoryCard.name=Parametrizer Memory Card
diff --git a/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png b/src/main/resources/assets/tectech/textures/items/itemConstructable.png
index dd2b6911c9..dd2b6911c9 100644
--- a/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png
+++ b/src/main/resources/assets/tectech/textures/items/itemConstructable.png
Binary files differ
diff --git a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png
index 0ef5e35895..2bdbb54ab7 100644
--- a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png
+++ b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png
Binary files differ
diff --git a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png
index 1a4c0dc9bc..b61a1725af 100644
--- a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png
+++ b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png
Binary files differ
generated by cgit (git 2.46.0) at 2025-03-10 03:36:15 +0000