aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java78
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java12
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java12
-rw-r--r--src/main/java/GoodGenerator/Items/MyMaterial.java104
-rw-r--r--src/main/java/GoodGenerator/Loader/RecipeLoader.java3
5 files changed, 119 insertions, 90 deletions
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
index 9ec679044a..93e6f0e6f9 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
@@ -5,13 +5,18 @@ import GoodGenerator.util.DescTextLocalization;
import GoodGenerator.util.MyRecipeAdder;
import com.github.bartimaeusnek.bartworks.util.Coords;
import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
+import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.mechanics.constructable.IConstructable;
import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
+import com.github.technus.tectech.mechanics.structure.IStructureElement;
import com.github.technus.tectech.mechanics.structure.StructureDefinition;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IHeatingCoil;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -21,6 +26,7 @@ import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Casings5;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -41,6 +47,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
private IStructureDefinition<FuelRefineFactory> multiDefinition = null;
private int Tier = -1;
+ private static final Block[] coils = new Block[]{Loaders.FRF_Coil_1,Loaders.FRF_Coil_2,Loaders.FRF_Coil_3};
private final HashSet<Coords> vis = new HashSet<>(64);
public FuelRefineFactory(String name){super(name);}
@@ -105,37 +112,53 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
)
).addElement(
'C',
- ofBlockAnyMeta(
- Loaders.FRF_Casings
+ ofBlock(
+ Loaders.FRF_Casings,0
)
).addElement(
'G',
- ofBlockAnyMeta(
- Loaders.fieldRestrictingGlass
+ ofBlock(
+ Loaders.fieldRestrictingGlass,0
)
).addElement(
'F',
- ofChain(
- ofBlock(
- Loaders.FRF_Coil_1,0
- ),
- ofBlock(
- Loaders.FRF_Coil_2,0
- ),
- ofBlock(
- Loaders.FRF_Coil_3,0
- ),
- ofBlockHint(
- Loaders.FRF_Coil_1,0
- )
-
- )
+ ofFieldCoil()
)
.build();
}
return multiDefinition;
}
+ public static <T> IStructureElement<T> ofFieldCoil() {
+ return new IStructureElement<T>() {
+ @Override
+ public boolean check(T t, World world, int x, int y, int z) {
+ Block block = world.getBlock(x, y, z);
+ for (Block tBlock : coils) {
+ if (tBlock.equals(block)) return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
+ TecTech.proxy.hint_particle(world, x, y, z, coils[getIndex(trigger)], 0);
+ return true;
+ }
+
+ private int getIndex(ItemStack trigger) {
+ int s = trigger.stackSize;
+ if (s > 3 || s <= 0) s = 3;
+ return s - 1;
+ }
+
+ @Override
+ public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
+ return world.setBlock(x, y, z, coils[getIndex(trigger)], 0, 3);
+ }
+ };
+ }
+
//In fact, this check method can't check structure correctly...
public boolean checkCoil(){
IGregTechTileEntity aTile = this.getBaseMetaTileEntity();
@@ -212,12 +235,6 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
@Override
public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
- mWrench = true;
- mScrewdriver = true;
- mSoftHammer = true;
- mHardHammer = true;
- mSolderingTool = true;
- mCrowbar = true;
return structureCheck_EM(mName, 7,12,1) && checkCoil();
}
@@ -304,6 +321,17 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
}
@Override
+ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+ super.onPostTick(aBaseMetaTileEntity, aTick);
+ mWrench = true;
+ mScrewdriver = true;
+ mSoftHammer = true;
+ mHardHammer = true;
+ mSolderingTool = true;
+ mCrowbar = true;
+ }
+
+ @Override
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new FuelRefineFactory(this.mName);
}
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
index fdbe5bcdd6..ee0fb9261f 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
@@ -111,22 +111,22 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem
)
).addElement(
'A',
- ofBlockAnyMeta(
+ ofBlock(
GregTech_API.sBlockCasings3, 12
)
).addElement(
'N',
- ofBlockAnyMeta(
- Loaders.radiationProtectionSteelFrame
+ ofBlock(
+ Loaders.radiationProtectionSteelFrame, 0
)
).addElement(
'C',
- ofBlockAnyMeta(
- Loaders.MAR_Casing
+ ofBlock(
+ Loaders.MAR_Casing, 0
)
).addElement(
'P',
- ofBlockAnyMeta(
+ ofBlock(
GregTech_API.sBlockCasings2,15
)
)
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
index cc689e39e1..0a29bc16c2 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
@@ -113,7 +113,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas
})
).addElement(
'T',
- ofBlockAnyMeta(
+ ofBlock(
GregTech_API.sBlockCasings4, 2
)
).addElement(
@@ -142,22 +142,22 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas
)
).addElement(
'P',
- ofBlockAnyMeta(
+ ofBlock(
GregTech_API.sBlockCasings2, 14
)
).addElement(
'C',
- ofBlockAnyMeta(
- Loaders.titaniumPlatedCylinder
+ ofBlock(
+ Loaders.titaniumPlatedCylinder, 0
)
).addElement(
'G',
- ofBlockAnyMeta(
+ ofBlock(
GregTech_API.sBlockCasings2, 4
)
).addElement(
'I',
- ofBlockAnyMeta(
+ ofBlock(
GregTech_API.sBlockCasings4, 13
)
)
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java
index 8c1c7cf214..ce8c9e14c5 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/GoodGenerator/Items/MyMaterial.java
@@ -12,6 +12,8 @@ import static gregtech.api.enums.Materials.*;
public class MyMaterial implements Runnable {
+ protected static final int OffsetID = 10001;
+
//Uranium Based Fuel Line
public static final Werkstoff graphiteUraniumMixture = new Werkstoff(
new short[]{0x3a,0x77,0x3d},
@@ -20,7 +22,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(),
- 31000,
+ OffsetID,
TextureSet.SET_DULL,
new Pair<> (Graphite,3),
new Pair<> (Uranium,1)
@@ -33,7 +35,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31001,
+ OffsetID + 1,
TextureSet.SET_FLUID
);
@@ -44,7 +46,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31002,
+ OffsetID + 2,
TextureSet.SET_FLUID
);
@@ -55,7 +57,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31003,
+ OffsetID + 3,
TextureSet.SET_FLUID
);
@@ -65,7 +67,7 @@ public class MyMaterial implements Runnable {
"Uranium Carbide-Thorium Mixture",
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(),
- 31004,
+ OffsetID + 4,
TextureSet.SET_DULL,
new Pair<> (Thorium,8),
new Pair<> (WerkstoffLoader.Thorium232,4),
@@ -80,7 +82,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31005,
+ OffsetID + 5,
TextureSet.SET_FLUID
);
@@ -91,7 +93,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31006,
+ OffsetID + 6,
TextureSet.SET_FLUID
);
@@ -102,7 +104,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31007,
+ OffsetID + 7,
TextureSet.SET_FLUID
);
@@ -112,7 +114,7 @@ public class MyMaterial implements Runnable {
"Plutonium Oxide-Uranium Mixture",
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(),
- 31008,
+ OffsetID + 8,
TextureSet.SET_SHINY,
new Pair<> (Plutonium,10),
new Pair<> (Oxygen,12),
@@ -127,7 +129,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31009,
+ OffsetID + 9,
TextureSet.SET_FLUID
);
@@ -138,7 +140,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31010,
+ OffsetID + 10,
TextureSet.SET_FLUID
);
@@ -149,7 +151,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31011,
+ OffsetID + 11,
TextureSet.SET_FLUID
);
@@ -159,7 +161,7 @@ public class MyMaterial implements Runnable {
"Oxalate",
Werkstoff.Types.BIOLOGICAL,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31012,
+ OffsetID + 12,
TextureSet.SET_FLUID,
new Pair<> (Hydrogen,2),
new Pair<> (Carbon,2),
@@ -171,7 +173,7 @@ public class MyMaterial implements Runnable {
"Vanadium Pentoxide",
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
- 31013,
+ OffsetID + 13,
TextureSet.SET_SHINY,
new Pair<> (Vanadium,2),
new Pair<> (Oxygen,5)
@@ -184,7 +186,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31014,
+ OffsetID + 14,
TextureSet.SET_DULL
);
@@ -195,7 +197,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
- 31015,
+ OffsetID + 15,
TextureSet.SET_DULL
);
@@ -206,7 +208,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
- 31016,
+ OffsetID + 16,
TextureSet.SET_SHINY
);
@@ -217,7 +219,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
- 31017,
+ OffsetID + 17,
TextureSet.SET_DULL
);
@@ -228,7 +230,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31018,
+ OffsetID + 18,
TextureSet.SET_FLUID
);
@@ -239,7 +241,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31019,
+ OffsetID + 19,
TextureSet.SET_FLUID
);
@@ -249,7 +251,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31020,
+ OffsetID + 20,
TextureSet.SET_FLUID,
new Pair<> (WerkstoffLoader.Thorium232,1),
new Pair<> (Fluorine,4)
@@ -263,7 +265,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setMeltingPoint(5000).setBlastFurnace(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems().addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(),
- 31021,
+ OffsetID + 21,
TextureSet.SET_SHINY
);
@@ -274,7 +276,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().addGems(),
- 31022,
+ OffsetID + 22,
TextureSet.SET_DIAMOND
);
@@ -286,7 +288,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setMeltingPoint(7000).setBlastFurnace(true),
Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems().addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(),
- 31023,
+ OffsetID + 23,
TextureSet.SET_SHINY
);
@@ -297,7 +299,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true).setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31024,
+ OffsetID + 24,
TextureSet.SET_FLUID
);
@@ -308,7 +310,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true).setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31025,
+ OffsetID + 25,
TextureSet.SET_FLUID
);
@@ -319,7 +321,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true).setRadioactive(true).setGas(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31026,
+ OffsetID + 26,
TextureSet.SET_FLUID
);
@@ -330,7 +332,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true).setRadioactive(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31027,
+ OffsetID + 27,
TextureSet.SET_FLUID
);
@@ -341,7 +343,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31028,
+ OffsetID + 28,
TextureSet.SET_FLUID,
new Pair<> (Carbon,4),
new Pair<> (Hydrogen, 10),
@@ -355,7 +357,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31029,
+ OffsetID + 29,
TextureSet.SET_FLUID
);
@@ -366,7 +368,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31030,
+ OffsetID + 30,
TextureSet.SET_FLUID
);
@@ -377,7 +379,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31037,
+ OffsetID + 31,
TextureSet.SET_FLUID
);
@@ -388,7 +390,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31031,
+ OffsetID + 32,
TextureSet.SET_FLUID
);
@@ -399,7 +401,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31032,
+ OffsetID + 33,
TextureSet.SET_FLUID
);
@@ -410,7 +412,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().onlyDust(),
- 31033,
+ OffsetID + 34,
TextureSet.SET_DULL
);
@@ -421,7 +423,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31034,
+ OffsetID + 35,
TextureSet.SET_FLUID
);
@@ -432,7 +434,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31035,
+ OffsetID + 36,
TextureSet.SET_FLUID
);
@@ -443,7 +445,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31036,
+ OffsetID + 37,
TextureSet.SET_FLUID
);
@@ -453,7 +455,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31038,
+ OffsetID + 38,
TextureSet.SET_FLUID
);
@@ -463,7 +465,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31039,
+ OffsetID + 39,
TextureSet.SET_FLUID
);
@@ -473,7 +475,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31040,
+ OffsetID + 40,
TextureSet.SET_FLUID
);
@@ -483,7 +485,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31041,
+ OffsetID + 41,
TextureSet.SET_FLUID
);
/*These materials will be enable when they are removed in GregTech*/
@@ -495,7 +497,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(),
- 31042,
+ OffsetID + 42,
TextureSet.SET_METALLIC
);
@@ -506,7 +508,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(),
- 31043,
+ OffsetID + 43,
TextureSet.SET_SHINY
);
@@ -517,7 +519,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats(),
Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(),
- 31044,
+ OffsetID + 44,
TextureSet.SET_METALLIC
);
*/
@@ -527,7 +529,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31045,
+ OffsetID + 45,
TextureSet.SET_FLUID
);
@@ -537,7 +539,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31046,
+ OffsetID + 46,
TextureSet.SET_FLUID
);
@@ -547,7 +549,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31047,
+ OffsetID + 47,
TextureSet.SET_FLUID
);
@@ -557,7 +559,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31048,
+ OffsetID + 48,
TextureSet.SET_FLUID
);
@@ -568,7 +570,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31049,
+ OffsetID + 49,
TextureSet.SET_FLUID
);
@@ -579,7 +581,7 @@ public class MyMaterial implements Runnable {
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
- 31050,
+ OffsetID + 50,
TextureSet.SET_FLUID
);
@Override
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index 3b630ccd9f..6558591a9a 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import gregtech.api.util.GT_Utility;
-import net.minecraftforge.oredict.OreDictionary;
public class RecipeLoader {
public static void RecipeLoad(){
@@ -40,7 +39,7 @@ public class RecipeLoader {
ItemList.Electric_Pump_ZPM.get(8),
new Object[]{OrePrefixes.circuit.get(Materials.Superconductor),4},
GT_OreDictUnificator.get(OrePrefixes.wireGt08,Materials.SuperconductorLuV,8),
- GT_OreDictUnificator.get(OrePrefixes.pipeLarge,Materials.Lead,4),
+ GT_OreDictUnificator.get(OrePrefixes.pipeHuge,Materials.Naquadah,4),
GT_OreDictUnificator.get(OrePrefixes.plate,Materials.NaquadahAlloy,8),
GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Osmium,16)
},
generated by cgit (git 2.46.0) at 2025-03-09 21:06:08 +0000