aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore10
-rw-r--r--.gradle/2.0/taskArtifacts/cache.properties1
-rw-r--r--.gradle/2.0/taskArtifacts/cache.properties.lockbin17 -> 0 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/fileHashes.binbin90246 -> 0 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/fileSnapshots.binbin326308 -> 0 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/outputFileStates.binbin18782 -> 0 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/taskArtifacts.binbin27678 -> 0 bytes
-rw-r--r--.gradle/4.4.1/fileChanges/last-build.binbin1 -> 0 bytes
-rw-r--r--.gradle/4.4.1/fileContent/annotation-processors.binbin19685 -> 0 bytes
-rw-r--r--.gradle/4.4.1/fileContent/fileContent.lockbin17 -> 0 bytes
-rw-r--r--.gradle/4.4.1/fileHashes/fileHashes.binbin87665 -> 0 bytes
-rw-r--r--.gradle/4.4.1/fileHashes/fileHashes.lockbin17 -> 0 bytes
-rw-r--r--.gradle/4.4.1/fileHashes/resourceHashesCache.binbin20673 -> 0 bytes
-rw-r--r--.gradle/4.4.1/taskHistory/taskHistory.binbin310291 -> 0 bytes
-rw-r--r--.gradle/4.4.1/taskHistory/taskHistory.lockbin17 -> 0 bytes
-rw-r--r--.gradle/buildOutputCleanup/buildOutputCleanup.lockbin17 -> 0 bytes
-rw-r--r--.gradle/buildOutputCleanup/cache.properties2
-rw-r--r--.gradle/buildOutputCleanup/outputFiles.binbin19019 -> 0 bytes
-rw-r--r--build.gradle2
-rw-r--r--src/main/java/kekztech/Items.java92
-rw-r--r--src/main/java/kekztech/KekzCore.java79
-rw-r--r--src/main/java/tileentities/TE_FluidConduit.java12
22 files changed, 133 insertions, 65 deletions
diff --git a/.gitignore b/.gitignore
index ef036dfea7..df7837cd40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,14 @@ hs_err_pid*
/crash-reports/
/saves/
/logs/
+/.gradle
+/.gradle/*
+.gradle
+eclipse/
+eclipse/*
+out/
+out/*
+*.iml
+*.ipr
+*.iws
diff --git a/.gradle/2.0/taskArtifacts/cache.properties b/.gradle/2.0/taskArtifacts/cache.properties
deleted file mode 100644
index 68737acfa2..0000000000
--- a/.gradle/2.0/taskArtifacts/cache.properties
+++ /dev/null
@@ -1 +0,0 @@
-#Sun Jun 09 22:52:57 CEST 2019
diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock
deleted file mode 100644
index f944a071bd..0000000000
--- a/.gradle/2.0/taskArtifacts/cache.properties.lock
+++ /dev/null
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin
deleted file mode 100644
index fb3630da2d..0000000000
--- a/.gradle/2.0/taskArtifacts/fileHashes.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin
deleted file mode 100644
index bd0d92ada8..0000000000
--- a/.gradle/2.0/taskArtifacts/fileSnapshots.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin
deleted file mode 100644
index d8268e34d2..0000000000
--- a/.gradle/2.0/taskArtifacts/outputFileStates.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin
deleted file mode 100644
index a31bb7f188..0000000000
--- a/.gradle/2.0/taskArtifacts/taskArtifacts.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/4.4.1/fileChanges/last-build.bin b/.gradle/4.4.1/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238ad..0000000000
--- a/.gradle/4.4.1/fileChanges/last-build.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/4.4.1/fileContent/annotation-processors.bin b/.gradle/4.4.1/fileContent/annotation-processors.bin
deleted file mode 100644
index bf4a1e62a8..0000000000
--- a/.gradle/4.4.1/fileContent/annotation-processors.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/4.4.1/fileContent/fileContent.lock b/.gradle/4.4.1/fileContent/fileContent.lock
deleted file mode 100644
index 3a0998d9f8..0000000000
--- a/.gradle/4.4.1/fileContent/fileContent.lock
+++ /dev/null
Binary files differ
diff --git a/.gradle/4.4.1/fileHashes/fileHashes.bin b/.gradle/4.4.1/fileHashes/fileHashes.bin
deleted file mode 100644
index 3808292b0f..0000000000
--- a/.gradle/4.4.1/fileHashes/fileHashes.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/4.4.1/fileHashes/fileHashes.lock b/.gradle/4.4.1/fileHashes/fileHashes.lock
deleted file mode 100644
index d4892b96c6..0000000000
--- a/.gradle/4.4.1/fileHashes/fileHashes.lock
+++ /dev/null
Binary files differ
diff --git a/.gradle/4.4.1/fileHashes/resourceHashesCache.bin b/.gradle/4.4.1/fileHashes/resourceHashesCache.bin
deleted file mode 100644
index d6817bf881..0000000000
--- a/.gradle/4.4.1/fileHashes/resourceHashesCache.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/4.4.1/taskHistory/taskHistory.bin b/.gradle/4.4.1/taskHistory/taskHistory.bin
deleted file mode 100644
index e14eeb7eb0..0000000000
--- a/.gradle/4.4.1/taskHistory/taskHistory.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/4.4.1/taskHistory/taskHistory.lock b/.gradle/4.4.1/taskHistory/taskHistory.lock
deleted file mode 100644
index 6a21252069..0000000000
--- a/.gradle/4.4.1/taskHistory/taskHistory.lock
+++ /dev/null
Binary files differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index 845d9b2263..0000000000
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ /dev/null
Binary files differ
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index d32ed2b7bd..0000000000
--- a/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Fri Oct 11 01:00:16 CEST 2019
-gradle.version=4.4.1
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
deleted file mode 100644
index 2dba47a02d..0000000000
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ /dev/null
Binary files differ
diff --git a/build.gradle b/build.gradle
index 1e32d5fffd..6eff98df89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'forge'
sourceCompatibility = 1.8
targetCompatibility = 1.8
-version = "0.2.1"
+version = "0.2.2"
group= "kekztech" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "kekztech"
diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java
index 52539222e7..9a7a351ec7 100644
--- a/src/main/java/kekztech/Items.java
+++ b/src/main/java/kekztech/Items.java
@@ -1,48 +1,92 @@
package kekztech;
+import cpw.mods.fml.common.Loader;
+import items.MetaItem_CraftingComponent;
+import items.MetaItem_ReactorComponent;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+import util.Util;
+
+import java.util.Arrays;
+
public enum Items {
// Heat Vents
- T1HeatVent(0), T2HeatVent(1), T3HeatVent(2), T4HeatVent(3),
- T1ComponentHeatVent(4), T2ComponentHeatVent(5), T3ComponentHeatVent(6), T4ComponentHeatVent(7),
- T1OverclockedHeatVent(8), T2OverclockedHeatVent(9), T3OverclockedHeatVent(10), T4OverclockedHeatVent(11),
+ T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0),
+ T1ComponentHeatVent(4,0), T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0),
+ T1OverclockedHeatVent(8,0), T2OverclockedHeatVent(9,0), T3OverclockedHeatVent(10,0), T4OverclockedHeatVent(11,0),
// Heat Exchanger
- T1HeatExchanger(12), T2HeatExchanger(13), T3HeatExchanger(14), T4HeatExchanger(15),
+ T1HeatExchanger(12,0), T2HeatExchanger(13,0), T3HeatExchanger(14,0), T4HeatExchanger(15,0),
// Fuel Rods
- UraniumFuelRod(16), UraniumDualFuelRod(17), UraniumQuadFuelRod(18),
- ThoriumFuelRod(19), ThoriumDualFuelRod(20), ThoriumQuadFuelRod(21),
- MOXFuelRod(22), MOXDualFuelRod(23), MOXQuadFuelRod(24),
- NaquadahFuelRod(25), NaquadahDualFuelRod(26), NaquadahQuadFuelRod(27),
- Th_MOXFuelRod(28), Th_MOXDualFuelRod(29), Th_MOXQuadFuelRod(30),
+ UraniumFuelRod(16,0), UraniumDualFuelRod(17,0), UraniumQuadFuelRod(18,0),
+ ThoriumFuelRod(19,0), ThoriumDualFuelRod(20,0), ThoriumQuadFuelRod(21,0),
+ MOXFuelRod(22,0), MOXDualFuelRod(23,0), MOXQuadFuelRod(24,0),
+ NaquadahFuelRod(25,0), NaquadahDualFuelRod(26,0), NaquadahQuadFuelRod(27,0),
+ Th_MOXFuelRod(28,0), Th_MOXDualFuelRod(29,0), Th_MOXQuadFuelRod(30,0),
// Depleted Fuel Rods
- DepletedUraniumFuelRod(31), DepletedUraniumDualFuelRod(32), DepletedUraniumQuadFuelRod(33),
- DepletedThoriumFuelRod(34), DepletedThoriumDualFuelRod(35), DepletedThoriumQuadFuelRod(36),
- DepletedMOXFuelRod(37), DepletedMOXDualFuelRod(38), DepletedMOXQuadFuelRod(39),
- DepletedNaquadahFuelRod(40), DepletedNaquadahDualFuelRod(41), DepletedNaquadahQuadFuelRod(42),
- Th_DepletedMOXFuelRod(43), Th_DepletedMOXDualFuelRod(44), Th_DepletedMOXQuadFuelRod(45),
+ DepletedUraniumFuelRod(31,0), DepletedUraniumDualFuelRod(32,0), DepletedUraniumQuadFuelRod(33,0),
+ DepletedThoriumFuelRod(34,0), DepletedThoriumDualFuelRod(35,0), DepletedThoriumQuadFuelRod(36,0),
+ DepletedMOXFuelRod(37,0), DepletedMOXDualFuelRod(38,0), DepletedMOXQuadFuelRod(39,0),
+ DepletedNaquadahFuelRod(40,0), DepletedNaquadahDualFuelRod(41,0), DepletedNaquadahQuadFuelRod(42,0),
+ Th_DepletedMOXFuelRod(43,0), Th_DepletedMOXDualFuelRod(44,0), Th_DepletedMOXQuadFuelRod(45,0),
// Neutron Reflectors
- T1NeutronReflector(46), T2NeutronReflector(47),
+ T1NeutronReflector(46,0), T2NeutronReflector(47,0),
// Coolant Cells
- HeliumCoolantCell360k(48), NaKCoolantCell360k(49),
+ HeliumCoolantCell360k(48,0), NaKCoolantCell360k(49,0),
// Heat Pipes
- CopperHeatPipe(0), SilverHeatPipe(1), BoronArsenideHeatPipe(2), DiamondHeatPipe(3),
- BoronArsenideDust(4), IsotopicallyPureDiamondDust(5), AmineCarbamiteDust(6),
- BoronArsenideCrystal(7), IsotopicallyPureDiamondCrystal(8),
+ CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1),
+ BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1),
+ BoronArsenideCrystal(7,1), IsotopicallyPureDiamondCrystal(8,1),
// Ceramics
- YSZCeramicDust(9), GDCCeramicDust(10),
- YttriaDust(11), ZirconiaDust(12), CeriaDust(13),
- YSZCeramicPlate(14), GDCCeramicPlate(15),
+ YSZCeramicDust(9,1), GDCCeramicDust(10,1),
+ YttriaDust(11,1), ZirconiaDust(12,1), CeriaDust(13,1),
+ YSZCeramicPlate(14,1), GDCCeramicPlate(15,1),
// Error Item
- Error(0);
+ Error(0,1);
+
+ static {
+ YttriaDust.setOreDictName("dustYttriumOxide");
+ ZirconiaDust.setOreDictName("dustCubicZirconia");
+ }
private final int metaID;
+ private final int identifier;
- private Items(int metaID) {
+ private Items(int metaID, int identifier) {
this.metaID = metaID;
+ this.identifier = identifier;
}
public int getMetaID() {
return metaID;
}
+ String OreDictName;
+
+ private void registerOreDict(){
+ OreDictionary.registerOre(getOreDictName(),getNonOreDictedItemStack(1));
+ }
+
+ public static void registerOreDictNames(){
+ Arrays.stream(Items.values()).filter(e -> e.getOreDictName() != null).forEach(Items::registerOreDict);
+ }
+
+ public ItemStack getNonOreDictedItemStack(int amount){
+ return identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(),amount,this.getMetaID()) :
+ new ItemStack(MetaItem_CraftingComponent.getInstance(),amount,this.getMetaID());
+ }
+
+ public ItemStack getOreDictedItemStack(int amount){
+ return this.getOreDictName() != null ? Util.getStackofAmountFromOreDict(this.getOreDictName(),amount) :
+ identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(),amount,this.getMetaID()) :
+ new ItemStack(MetaItem_CraftingComponent.getInstance(),amount,this.getMetaID());
+ }
+
+ public String getOreDictName() {
+ return OreDictName;
+ }
+
+ public void setOreDictName(String oreDictName) {
+ OreDictName = oreDictName;
+ }
}
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 993b984d4a..a832faa484 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -11,6 +11,7 @@ import blocks.Block_TFFTStorageFieldBlockT2;
import blocks.Block_TFFTStorageFieldBlockT3;
import blocks.Block_TFFTStorageFieldBlockT4;
import blocks.Block_YSZUnit;
+import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -43,14 +44,15 @@ import util.Util;
*/
@Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION,
dependencies =
- "required-after:IC2; "
+ "required-after:IC2; "
+ "required-after:gregtech;"
+ + "after:bartworks"
)
public class KekzCore {
public static final String NAME = "KekzTech";
public static final String MODID = "kekztech";
- public static final String VERSION = "0.2.1";
+ public static final String VERSION = "0.2.2";
@Mod.Instance("kekztech")
public static KekzCore instance;
@@ -67,6 +69,7 @@ public class KekzCore {
ErrorItem.getInstance().registerItem();
MetaItem_ReactorComponent.getInstance().registerItem();
MetaItem_CraftingComponent.getInstance().registerItem();
+ Items.registerOreDictNames();
// Blocks
Block_YSZUnit.getInstance().registerBlock();
Block_GDCUnit.getInstance().registerBlock();
@@ -98,13 +101,13 @@ public class KekzCore {
final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance();
final MetaItem_ReactorComponent reactorItem = MetaItem_ReactorComponent.getInstance();
-
+
// Multiblock Controllers
final Object[] mk1_recipe = {
"CCC", "PHP", "FBL",
'C', OrePrefixes.circuit.get(Materials.Advanced),
- 'P', ItemList.Electric_Pump_HV.get(1L, (Object[]) null),
- 'H', ItemList.Hull_HV.get(1L, (Object[]) null),
+ 'P', ItemList.Electric_Pump_HV.get(1L),
+ 'H', ItemList.Hull_HV.get(1L),
'F', GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.StainlessSteel, 1),
'B', GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Gold, 1),
'L', GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1)
@@ -113,8 +116,8 @@ public class KekzCore {
final Object[] mk2_recipe = {
"CCC", "PHP", "FBL",
'C', OrePrefixes.circuit.get(Materials.Master),
- 'P', ItemList.Electric_Pump_IV.get(1L, (Object[]) null),
- 'H', ItemList.Hull_IV.get(1L, (Object[]) null),
+ 'P', ItemList.Electric_Pump_IV.get(1L),
+ 'H', ItemList.Hull_IV.get(1L),
'F', GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1),
'B', Util.getStackofAmountFromOreDict("wireGt04SuperconductorEV", 1),
'L', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1)
@@ -123,8 +126,8 @@ public class KekzCore {
final Object[] tfft_recipe = {
"HFH", "PVP", "CFC",
'H', OrePrefixes.pipeMedium.get(Materials.StainlessSteel),
- 'F', ItemList.Field_Generator_MV.get(1L, (Object[]) null),
- 'P', ItemList.Electric_Pump_HV.get(1L, (Object[]) null),
+ 'F', ItemList.Field_Generator_MV.get(1L),
+ 'P', ItemList.Electric_Pump_HV.get(1L),
'V', OrePrefixes.rotor.get(Materials.VibrantAlloy),
'C', OrePrefixes.circuit.get(Materials.Data)
};
@@ -136,7 +139,7 @@ public class KekzCore {
craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 4),
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Yttrium, 1),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1),
- ItemList.Electric_Motor_HV.get(1L, (Object[]) null),
+ ItemList.Electric_Motor_HV.get(1L),
};
GT_Values.RA.addAssemblerRecipe(
yszUnit,
@@ -148,7 +151,7 @@ public class KekzCore {
craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 8),
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, new ItemStack(ErrorItem.getInstance(), 1), 1),
- ItemList.Electric_Motor_IV.get(1L, (Object[]) null),
+ ItemList.Electric_Motor_IV.get(1L),
};
GT_Values.RA.addAssemblerRecipe(
gdcUnit,
@@ -173,7 +176,7 @@ public class KekzCore {
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 1),
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1),
- ItemList.Electric_Pump_LV.get(1L, (Object[]) null)
+ ItemList.Electric_Pump_LV.get(1L)
};
GT_Values.RA.addAssemblerRecipe(
tfftstoragefield1,
@@ -185,7 +188,7 @@ public class KekzCore {
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 4),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1),
- ItemList.Electric_Pump_MV.get(1L, (Object[]) null)
+ ItemList.Electric_Pump_MV.get(1L)
};
GT_Values.RA.addAssemblerRecipe(
tfftstoragefield2,
@@ -197,8 +200,8 @@ public class KekzCore {
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2),
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1),
- ItemList.Field_Generator_MV.get(1L, (Object[]) null),
- ItemList.Electric_Pump_HV.get(2L, (Object[]) null)
+ ItemList.Field_Generator_MV.get(1L),
+ ItemList.Electric_Pump_HV.get(2L)
};
GT_Values.RA.addAssemblerRecipe(
tfftstoragefield3,
@@ -210,8 +213,8 @@ public class KekzCore {
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 4),
GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.NiobiumTitanium, 1),
GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.TungstenSteel, 1),
- ItemList.Field_Generator_HV.get(1L, (Object[]) null),
- ItemList.Electric_Pump_EV.get(1L, (Object[]) null)
+ ItemList.Field_Generator_HV.get(1L),
+ ItemList.Electric_Pump_EV.get(1L)
};
GT_Values.RA.addAssemblerRecipe(
tfftstoragefield4,
@@ -222,7 +225,7 @@ public class KekzCore {
GT_Utility.getIntegratedCircuit(6),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),
GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 25),
- ItemList.Field_Generator_HV.get(1L, (Object[]) null)
+ ItemList.Field_Generator_HV.get(1L)
};
GT_Values.RA.addAssemblerRecipe(
tfftmultihatch,
@@ -257,13 +260,13 @@ public class KekzCore {
// Ceramic plates
GT_Values.RA.addAlloySmelterRecipe(
- craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 10),
- ItemList.Shape_Mold_Plate.get(1, (Object[]) null),
+ craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), Loader.isModLoaded("bartworks") ? 3 : 10),
+ ItemList.Shape_Mold_Plate.get(1),
craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1),
400, 480);
GT_Values.RA.addFormingPressRecipe(
craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10),
- ItemList.Shape_Mold_Plate.get(1, (Object[]) null),
+ ItemList.Shape_Mold_Plate.get(1),
craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 1),
800, 480);
@@ -286,28 +289,30 @@ public class KekzCore {
null,
craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondDust.getMetaID(), 1),
null, 1200, 480);
- GT_Values.RA.addChemicalRecipe(
- Materials.Yttrium.getDust(1), GT_Utility.getIntegratedCircuit(6), Materials.Oxygen.getGas(3000),
- null, craftingItem.getStackOfAmountFromDamage(Items.YttriaDust.getMetaID(), 1), null,
- 400, 30);
- GT_Values.RA.addChemicalRecipe(
- Util.getStackofAmountFromOreDict("dustZirconium", 1), GT_Utility.getIntegratedCircuit(6), Materials.Oxygen.getGas(2000),
- null, craftingItem.getStackOfAmountFromDamage(Items.ZirconiaDust.getMetaID(), 1), null,
- 400, 30);
+ if (!Loader.isModLoaded("bartworks")) {
+ GT_Values.RA.addChemicalRecipe(
+ Materials.Yttrium.getDust(1), GT_Utility.getIntegratedCircuit(6), Materials.Oxygen.getGas(3000),
+ null, craftingItem.getStackOfAmountFromDamage(Items.YttriaDust.getMetaID(), 1), null,
+ 400, 30);
+ GT_Values.RA.addChemicalRecipe(
+ Util.getStackofAmountFromOreDict("dustZirconium", 1), GT_Utility.getIntegratedCircuit(6), Materials.Oxygen.getGas(2000),
+ null, craftingItem.getStackOfAmountFromDamage(Items.ZirconiaDust.getMetaID(), 1), null,
+ 400, 30);
+ }
GT_Values.RA.addChemicalRecipe(
Materials.Cerium.getDust(2), GT_Utility.getIntegratedCircuit(6), Materials.Oxygen.getGas(3000),
null, craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 2), null,
400, 30);
GT_Values.RA.addMixerRecipe(
- craftingItem.getStackOfAmountFromDamage(Items.YttriaDust.getMetaID(), 1),
- craftingItem.getStackOfAmountFromDamage(Items.ZirconiaDust.getMetaID(), 5),
- GT_Utility.getIntegratedCircuit(6), null, null, null,
+ Items.YttriaDust.getOreDictedItemStack(1),
+ Items.ZirconiaDust.getOreDictedItemStack(5),
+ GT_Utility.getIntegratedCircuit(6), null, null, null,
craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 6),
400, 96);
GT_Values.RA.addMixerRecipe(
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1),
- craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 9),
- GT_Utility.getIntegratedCircuit(6), null, null, null,
+ craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 9),
+ GT_Utility.getIntegratedCircuit(6), null, null, null,
craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10),
400, 1920);
@@ -342,7 +347,7 @@ public class KekzCore {
// Heat Vents
final ItemStack[] t1HeatVent = {
craftingItem.getStackOfAmountFromDamage(Items.CopperHeatPipe.getMetaID(), 2),
- ItemList.Electric_Motor_MV.get(1L, (Object[]) null),
+ ItemList.Electric_Motor_MV.get(1L),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 2),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, new ItemStack(ErrorItem.getInstance(), 1), 8),
@@ -356,7 +361,7 @@ public class KekzCore {
200, 120);
final ItemStack[] t2HeatVent = {
craftingItem.getStackOfAmountFromDamage(Items.SilverHeatPipe.getMetaID(), 2),
- ItemList.Electric_Motor_HV.get(1L, (Object[]) null),
+ ItemList.Electric_Motor_HV.get(1L),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 2),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Aluminium, new ItemStack(ErrorItem.getInstance(), 1), 8),
@@ -370,7 +375,7 @@ public class KekzCore {
400, 480);
final ItemStack[] t3HeatVent = {
craftingItem.getStackOfAmountFromDamage(Items.BoronArsenideHeatPipe.getMetaID(), 2),
- ItemList.Electric_Motor_IV.get(1L, (Object[]) null),
+ ItemList.Electric_Motor_IV.get(1L),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, new ItemStack(ErrorItem.getInstance(), 1), 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, new ItemStack(ErrorItem.getInstance(), 1), 2),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tungsten, new ItemStack(ErrorItem.getInstance(), 1), 8),
diff --git a/src/main/java/tileentities/TE_FluidConduit.java b/src/main/java/tileentities/TE_FluidConduit.java
index 3a8f91b5be..35d0469051 100644
--- a/src/main/java/tileentities/TE_FluidConduit.java
+++ b/src/main/java/tileentities/TE_FluidConduit.java
@@ -40,6 +40,18 @@ public class TE_FluidConduit extends TileEntity implements IConduit, IFluidHandl
}
@Override
+ public boolean testForInputFilter(Object o) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean testForOutputFilter(Object o) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
// TODO Auto-generated method stub
return 0;
generated by cgit (git 2.46.0) at 2025-03-09 22:57:20 +0000