From 815ddbfe127301f8586599f1c5483a09f9a6374a Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Tue, 18 Feb 2020 12:32:37 +0100 Subject: one more TFFT cell, fixed press/alloying recipes, improved fuel cells --- src/main/java/kekztech/KekzCore.java | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 247131c7f7..114446ad38 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -16,6 +16,7 @@ import blocks.Block_TFFTStorageFieldBlockT1; import blocks.Block_TFFTStorageFieldBlockT2; import blocks.Block_TFFTStorageFieldBlockT3; import blocks.Block_TFFTStorageFieldBlockT4; +import blocks.Block_TFFTStorageFieldBlockT5; import blocks.Block_YSZUnit; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.Loader; @@ -95,6 +96,7 @@ public class KekzCore { Block_TFFTStorageFieldBlockT2.getInstance().registerBlock(); Block_TFFTStorageFieldBlockT3.getInstance().registerBlock(); Block_TFFTStorageFieldBlockT4.getInstance().registerBlock(); + Block_TFFTStorageFieldBlockT5.getInstance().registerBlock(); Block_TFFTMultiHatch.getInstance().registerBlock(); Block_ReactorChamber_OFF.getInstance().registerBlock(); Block_ReactorChamber_ON.getInstance().registerBlock(); @@ -284,7 +286,7 @@ public class KekzCore { 200, 480); final ItemStack[] tfftstoragefield3 = { GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1), ItemList.Field_Generator_MV.get(1L), @@ -308,6 +310,19 @@ public class KekzCore { FluidRegistry.getFluidStack("molten.epoxid", 1152), new ItemStack(Block_TFFTStorageFieldBlockT4.getInstance(), 1), 400, 4098); + final ItemStack[] tfftstoragefield5 = { + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), + GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Enderium, 1), + ItemList.Field_Generator_EV.get(1L), + ItemList.Electric_Pump_IV.get(1L) + }; + GT_Values.RA.addAssemblerRecipe( + tfftstoragefield5, + FluidRegistry.getFluidStack("molten.epoxid", 1152), + new ItemStack(Block_TFFTStorageFieldBlockT5.getInstance(), 1), + 400, 4098); final Object[] multi_hatch = { "PRP", "UFU", "PRP", 'P', GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 1), @@ -345,12 +360,12 @@ public class KekzCore { // Ceramic plates GT_Values.RA.addAlloySmelterRecipe( craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), Loader.isModLoaded("bartworks") ? 3 : 10), - ItemList.Shape_Mold_Plate.get(1), + ItemList.Shape_Mold_Plate.get(0), craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1), 400, 480); GT_Values.RA.addFormingPressRecipe( craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10), - ItemList.Shape_Mold_Plate.get(1), + ItemList.Shape_Mold_Plate.get(0), craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 1), 800, 480); -- cgit From ba8d49bd6c77d69630135c887272e9d0c8c7311d Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Tue, 18 Feb 2020 16:01:52 +0100 Subject: Fixed Item Server structure check. Wrote better doc for the MIH --- src/main/java/kekztech/KekzCore.java | 1 - src/main/java/kekztech/MultiItemHandler.java | 112 +++++++++++++++++++-------- 2 files changed, 80 insertions(+), 33 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 114446ad38..64e1298d3c 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -18,7 +18,6 @@ import blocks.Block_TFFTStorageFieldBlockT3; import blocks.Block_TFFTStorageFieldBlockT4; import blocks.Block_TFFTStorageFieldBlockT5; import blocks.Block_YSZUnit; -import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; diff --git a/src/main/java/kekztech/MultiItemHandler.java b/src/main/java/kekztech/MultiItemHandler.java index 766abbbb93..9416dbebcf 100644 --- a/src/main/java/kekztech/MultiItemHandler.java +++ b/src/main/java/kekztech/MultiItemHandler.java @@ -1,7 +1,5 @@ package kekztech; -import java.util.ArrayList; - import net.minecraft.item.ItemStack; public class MultiItemHandler { @@ -10,31 +8,44 @@ public class MultiItemHandler { private boolean locked = true; - private final ArrayList items = new ArrayList<>(); + private ItemStack[] items; public MultiItemHandler() { } - /** - * Tries to adapt the internal storage to match structure changes. - * Structure should turn off and give a warning if this returns false. - * Otherwise items might unavailable. + /** + * Adapts the internal storage to structure changes. + * In the event of structure down-sizing, all excess items + * will be dropped on the ground. * * @param itemTypeCapacity - * New item array length to adapt to. - * @return Success status of the operation. */ - public boolean setItemTypeCapacity(int itemTypeCapacity) { - if(items.size() > itemTypeCapacity) { - System.out.println("WARNING: ITEM SERVER STRUCTURE WAS DOWNSIZED TOO FAR! LOCKING FOR SAFETY."); - setLock(true); - return false; + public void setItemTypeCapacity(int itemTypeCapacity) { + if(items.length > itemTypeCapacity) { + // Generate new smaller backing array + final ItemStack[] newItems = new ItemStack[itemTypeCapacity]; + for(int i = 0; i < newItems.length; i++) { + newItems[i] = items[i]; + } + // Sort out item overflow + final ItemStack[] toDrop = new ItemStack[items.length - itemTypeCapacity]; + for(int i = 0; i < toDrop.length; i++) { + toDrop[i] = items[i + newItems.length - 1]; + } + // TODO drop overflow items to the ground + + // Swap array + items = newItems; } else { - items.ensureCapacity(itemTypeCapacity); - // If the lock was engaged, it should only be disengaged by turning - // the structure back on after fixing the above warning. - return true; + // Generate new larger backing array + final ItemStack[] newItems = new ItemStack[itemTypeCapacity]; + for(int i = 0; i < items.length; i++) { + newItems[i] = items[i]; + } + + // Swap array + items = newItems; } } @@ -44,7 +55,6 @@ public class MultiItemHandler { /** * Lock internal storage in case Item Server is not running. - * May also be engaged in case of item safety issues. * * @param state * Lock state. @@ -54,60 +64,98 @@ public class MultiItemHandler { } public int getItemTypeCapacity() { - return items.size(); + return items.length; } public int getPerTypeCapacity() { return perTypeCapacity; } + /** + * Returns the ItemStack from the specified slot. + * + * @param slot + * Storage slot number. Zero indexed. + * @return + * ItemStack from storage or null if + * storage is locked or invalid slot parameter. + */ public ItemStack getStackInSlot(int slot) { System.out.println("Stack in slot " + slot + " requested"); - if(locked || slot >= items.size()) { + if(locked || slot >= items.length) { return null; } else { - return items.get(slot); + return items[slot]; } } + /** + * Inserts a new ItemStack into storage, + * but only if the slot is still unassigned. + * + * @param slot + * Storage slot number. Zero indexed. + * @param itemStack + * ItemStack to insert. + */ public void insertStackInSlot(int slot, ItemStack itemStack) { System.out.println("Inserting " + itemStack.getDisplayName() + " into " + slot); if(itemStack == null - || items.get(slot) != null + || items[slot] != null || locked - || slot >= items.size()) { + || slot >= items.length) { return; } else { - items.set(slot, itemStack); + items[slot] = itemStack; } } + /** + * Tries to increase the item amount in a specified slot. + * + * @param slot + * Storage slot number. Zero indexed. + * @param amount + * Amount to increase by. + * @return + * Actual amount the item amount was increased by. + */ public int increaseStackInSlot(int slot, int amount) { System.out.println("Increasing item in slot " + slot + " by " + amount); - if(slot >= items.size() + if(slot >= items.length || locked || amount <= 0) { return 0; } else { - final int space = perTypeCapacity - items.get(slot).stackSize; + final int space = perTypeCapacity - items[slot].stackSize; final int fit = Math.min(space, amount); - items.get(slot).stackSize += fit; + items[slot].stackSize += fit; return fit; } } + /** + * Tries to reduce the item amount in a specified slot. + * + * @param slot + * Storage slot number. Zero indexed. + * @param amount + * Amount to decrease by. + * @return + * Actual amount the item amount was decreased by. + */ public int reduceStackInSlot(int slot, int amount) { System.out.println("Reducing item in slot " + slot + " by " + amount); - if(slot >= items.size() + if(slot >= items.length || locked || amount <= 0) { return 0; } else { - final int available = items.get(slot).stackSize; + final int available = items[slot].stackSize; final int take = Math.min(available, amount); - items.get(slot).stackSize -= take; + items[slot].stackSize -= take; if(take == available) { - items.set(slot, null); + items[slot] = null; } return take; } -- cgit From e3568bc7c726a8893b45ab15fb984a88ebab1a5c Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Tue, 18 Feb 2020 16:50:20 +0100 Subject: Improved TE IS IO port code but it's still not working --- src/main/java/kekztech/MultiItemHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/MultiItemHandler.java b/src/main/java/kekztech/MultiItemHandler.java index 9416dbebcf..58dd0660e9 100644 --- a/src/main/java/kekztech/MultiItemHandler.java +++ b/src/main/java/kekztech/MultiItemHandler.java @@ -64,7 +64,7 @@ public class MultiItemHandler { } public int getItemTypeCapacity() { - return items.length; + return items != null ? items.length : 0; } public int getPerTypeCapacity() { @@ -97,16 +97,19 @@ public class MultiItemHandler { * Storage slot number. Zero indexed. * @param itemStack * ItemStack to insert. + * @return + * Operation success state. */ - public void insertStackInSlot(int slot, ItemStack itemStack) { + public boolean insertStackInSlot(int slot, ItemStack itemStack) { System.out.println("Inserting " + itemStack.getDisplayName() + " into " + slot); if(itemStack == null || items[slot] != null || locked || slot >= items.length) { - return; + return false; } else { items[slot] = itemStack; + return true; } } -- cgit From 03a0e592bd88a5609c45b0f605ab38ac07047c7f Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 4 Mar 2020 15:18:44 +0100 Subject: removed WIP things for v0.2.3 bug fix release --- src/main/java/kekztech/KekzCore.java | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 64e1298d3c..baf84cd18f 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -85,7 +85,7 @@ public class KekzCore { ErrorItem.getInstance().registerItem(); MetaItem_ReactorComponent.getInstance().registerItem(); MetaItem_CraftingComponent.getInstance().registerItem(); - Item_Configurator.getInstance().registerItem(); + // disabled for release; Item_Configurator.getInstance().registerItem(); Items.registerOreDictNames(); // Blocks Block_YSZUnit.getInstance().registerBlock(); @@ -100,18 +100,18 @@ public class KekzCore { Block_ReactorChamber_OFF.getInstance().registerBlock(); Block_ReactorChamber_ON.getInstance().registerBlock(); Block_ControlRod.getInstance().registerBlock(); - Block_ItemServerDrive.getInstance().registerBlock(); - Block_ItemServerRackCasing.getInstance().registerBlock(); - Block_ItemServerIOPort.getInstance().registerBlock(); - Block_ItemProxyCable.getInstance().registerBlock(); - Block_ItemProxySource.getInstance().registerBlock(); - Block_ItemProxyEndpoint.getInstance().registerBlock(); + // disabled for release; Block_ItemServerDrive.getInstance().registerBlock(); + // disabled for release; Block_ItemServerRackCasing.getInstance().registerBlock(); + // disabled for release; Block_ItemServerIOPort.getInstance().registerBlock(); + // disabled for release; Block_ItemProxyCable.getInstance().registerBlock(); + // disabled for release; Block_ItemProxySource.getInstance().registerBlock(); + // disabled for release; Block_ItemProxyEndpoint.getInstance().registerBlock(); // Register TileEntities GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile"); - GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile"); - GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile"); - GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); - GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); + // disabled for release; GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile"); + // disabled for release; GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile"); + // disabled for release; GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); + // disabled for release; GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); // Register guis NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler()); @@ -124,9 +124,9 @@ public class KekzCore { sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II"); mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor"); fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T"); - is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server"); + // disabled for release; is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server"); // Register renderer - ConduitRenderer.getInstance().registerRenderer(); + // disabled for release; ConduitRenderer.getInstance().registerRenderer(); } @Mod.EventHandler @@ -165,7 +165,7 @@ public class KekzCore { 'C', OrePrefixes.circuit.get(Materials.Data) }; GT_ModHandler.addCraftingRecipe(fms.getStackForm(1), tfft_recipe); - final Object[] is_recipe = { + /*final Object[] is_recipe = { "FRF", "CGC", "PZP", 'F', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), 'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1), @@ -174,7 +174,7 @@ public class KekzCore { 'P', GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 1), 'Z', GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1) }; - GT_ModHandler.addCraftingRecipe(is.getStackForm(1), is_recipe); + GT_ModHandler.addCraftingRecipe(is.getStackForm(1), is_recipe);*/ // Ceramic Electrolyte Units @@ -204,7 +204,7 @@ public class KekzCore { 2400, 1920); // Item Server Structure blocks - final Object[] is_rack_recipe = { + /*final Object[] is_rack_recipe = { "BRB", "CFC", "BRB", 'B', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 1), 'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 1), @@ -245,7 +245,7 @@ public class KekzCore { is_drive, FluidRegistry.getFluidStack("molten.polyethylene", 1152), new ItemStack(Block_ItemServerDrive.getInstance(), 1), - 200, 7680); + 200, 7680);*/ // T.F.F.T Structure blocks final ItemStack[] tfftcasing = { @@ -321,7 +321,7 @@ public class KekzCore { tfftstoragefield5, FluidRegistry.getFluidStack("molten.epoxid", 1152), new ItemStack(Block_TFFTStorageFieldBlockT5.getInstance(), 1), - 400, 4098); + 400, 6147); final Object[] multi_hatch = { "PRP", "UFU", "PRP", 'P', GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 1), -- cgit From 193e453b3fc84f2b2c8ad90db6372ca9f48abca4 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 4 Mar 2020 16:22:09 +0100 Subject: updated version number --- src/main/java/kekztech/KekzCore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index baf84cd18f..c7fe8df8ee 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -67,7 +67,7 @@ public class KekzCore { public static final String NAME = "KekzTech"; public static final String MODID = "kekztech"; - public static final String VERSION = "0.2.2"; + public static final String VERSION = "0.2.3"; @Mod.Instance("kekztech") public static KekzCore instance; -- cgit From 60554a28fc5b2d0753a8c63935b00b9ba84ea058 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 11 Mar 2020 20:36:28 +0100 Subject: re-enabled WIP content for further dev work --- src/main/java/kekztech/KekzCore.java | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index c7fe8df8ee..368ea6f185 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -85,7 +85,7 @@ public class KekzCore { ErrorItem.getInstance().registerItem(); MetaItem_ReactorComponent.getInstance().registerItem(); MetaItem_CraftingComponent.getInstance().registerItem(); - // disabled for release; Item_Configurator.getInstance().registerItem(); + Item_Configurator.getInstance().registerItem(); Items.registerOreDictNames(); // Blocks Block_YSZUnit.getInstance().registerBlock(); @@ -100,18 +100,18 @@ public class KekzCore { Block_ReactorChamber_OFF.getInstance().registerBlock(); Block_ReactorChamber_ON.getInstance().registerBlock(); Block_ControlRod.getInstance().registerBlock(); - // disabled for release; Block_ItemServerDrive.getInstance().registerBlock(); - // disabled for release; Block_ItemServerRackCasing.getInstance().registerBlock(); - // disabled for release; Block_ItemServerIOPort.getInstance().registerBlock(); - // disabled for release; Block_ItemProxyCable.getInstance().registerBlock(); - // disabled for release; Block_ItemProxySource.getInstance().registerBlock(); - // disabled for release; Block_ItemProxyEndpoint.getInstance().registerBlock(); + Block_ItemServerDrive.getInstance().registerBlock(); + Block_ItemServerRackCasing.getInstance().registerBlock(); + Block_ItemServerIOPort.getInstance().registerBlock(); + Block_ItemProxyCable.getInstance().registerBlock(); + Block_ItemProxySource.getInstance().registerBlock(); + Block_ItemProxyEndpoint.getInstance().registerBlock(); // Register TileEntities GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile"); - // disabled for release; GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile"); - // disabled for release; GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile"); - // disabled for release; GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); - // disabled for release; GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); + GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile"); + GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile"); + GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); + GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); // Register guis NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler()); @@ -124,9 +124,9 @@ public class KekzCore { sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II"); mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor"); fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T"); - // disabled for release; is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server"); + is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server"); // Register renderer - // disabled for release; ConduitRenderer.getInstance().registerRenderer(); + ConduitRenderer.getInstance().registerRenderer(); } @Mod.EventHandler -- cgit From 7f927621de00e55ad6cedca256a6f54cfa12c2be Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sun, 19 Apr 2020 21:06:33 +0200 Subject: New TC jar textures --- src/main/java/kekztech/KekzCore.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 368ea6f185..56645e9050 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -2,6 +2,7 @@ package kekztech; import blocks.Block_ControlRod; import blocks.Block_GDCUnit; +import blocks.Block_IchorJar; import blocks.Block_ItemProxyCable; import blocks.Block_ItemProxyEndpoint; import blocks.Block_ItemProxySource; @@ -17,6 +18,7 @@ import blocks.Block_TFFTStorageFieldBlockT2; import blocks.Block_TFFTStorageFieldBlockT3; import blocks.Block_TFFTStorageFieldBlockT4; import blocks.Block_TFFTStorageFieldBlockT5; +import blocks.Block_ThaumiumReinforcedJar; import blocks.Block_YSZUnit; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -34,6 +36,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import items.ErrorItem; import items.Item_Configurator; +import items.Item_ThaumiumReinforcedJarFilled; import items.MetaItem_CraftingComponent; import items.MetaItem_ReactorComponent; import net.minecraft.item.ItemStack; @@ -44,11 +47,13 @@ import tileentities.GTMTE_ItemServer; import tileentities.GTMTE_ModularNuclearReactor; import tileentities.GTMTE_SOFuelCellMK1; import tileentities.GTMTE_SOFuelCellMK2; +import tileentities.TE_IchorJar; import tileentities.TE_ItemProxyCable; import tileentities.TE_ItemProxyEndpoint; import tileentities.TE_ItemProxySource; import tileentities.TE_ItemServerIOPort; import tileentities.TE_TFFTMultiHatch; +import tileentities.TE_ThaumiumReinforcedJar; import util.Util; /** @@ -87,6 +92,9 @@ public class KekzCore { MetaItem_CraftingComponent.getInstance().registerItem(); Item_Configurator.getInstance().registerItem(); Items.registerOreDictNames(); + + Item_ThaumiumReinforcedJarFilled.getInstance().registerItem(); + // Blocks Block_YSZUnit.getInstance().registerBlock(); Block_GDCUnit.getInstance().registerBlock(); @@ -106,6 +114,10 @@ public class KekzCore { Block_ItemProxyCable.getInstance().registerBlock(); Block_ItemProxySource.getInstance().registerBlock(); Block_ItemProxyEndpoint.getInstance().registerBlock(); + + Block_ThaumiumReinforcedJar.getInstance().registerBlock(); + Block_IchorJar.getInstance().registerBlock(); + // Register TileEntities GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile"); GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile"); @@ -113,6 +125,9 @@ public class KekzCore { GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); + GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar"); + GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar"); + // Register guis NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler()); } -- cgit From d48674f9c4243fe4439999e59c798a13113f3037 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Thu, 23 Apr 2020 22:06:32 +0200 Subject: Fixed Multi Hatch ignoring circuit in controller when drained from --- src/main/java/kekztech/KekzCore.java | 2 +- src/main/java/kekztech/MultiFluidHandler.java | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 56645e9050..cff0a69b0a 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -133,7 +133,7 @@ public class KekzCore { } @Mod.EventHandler - public void init(FMLInitializationEvent event ) { + public void init(FMLInitializationEvent event) { // Multiblock controllers sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I"); sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II"); diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java index a96094a8f0..880576ca7e 100644 --- a/src/main/java/kekztech/MultiFluidHandler.java +++ b/src/main/java/kekztech/MultiFluidHandler.java @@ -15,6 +15,7 @@ public class MultiFluidHandler { private int capacityPerFluid; private boolean locked = true; + private byte fluidSelector = -1; public MultiFluidHandler() { @@ -39,6 +40,26 @@ public class MultiFluidHandler { locked = state; } + /** + * Used to tell the MFH if a fluid is selected by + * an Integrated Circuit in the controller. + * + * @param fluidSelector + * Selected fluid or -1 if no fluid is selected + */ + public void setFluidSelector(byte fluidSelector) { + this.fluidSelector = fluidSelector; + } + + /** + * + * @return + * Selected fluid or -1 if no fluid is selected + */ + public byte getSelectedFluid() { + return fluidSelector; + } + public boolean contains(FluidStack fluid) { return !locked && fluids.contains(fluid); } -- cgit From 86e6c42b774cd3102b3570026f0ab2c27e948838 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 01:11:46 +0200 Subject: Added WIP tags to Item Server content. Will include in next release --- src/main/java/kekztech/KekzCore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index cff0a69b0a..90a3df2960 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -326,7 +326,7 @@ public class KekzCore { 400, 4098); final ItemStack[] tfftstoragefield5 = { GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4), GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.HSSS, 1), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Enderium, 1), ItemList.Field_Generator_EV.get(1L), -- cgit From 4e465dffd1d289e6d5757929252e66cf0eee3249 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 20:14:42 +0200 Subject: moved blocks and TEs into 'common' package --- src/main/java/kekztech/KekzCore.java | 64 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 90a3df2960..55291eeadc 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -1,25 +1,37 @@ package kekztech; -import blocks.Block_ControlRod; -import blocks.Block_GDCUnit; -import blocks.Block_IchorJar; -import blocks.Block_ItemProxyCable; -import blocks.Block_ItemProxyEndpoint; -import blocks.Block_ItemProxySource; -import blocks.Block_ItemServerDrive; -import blocks.Block_ItemServerIOPort; -import blocks.Block_ItemServerRackCasing; -import blocks.Block_ReactorChamber_OFF; -import blocks.Block_ReactorChamber_ON; -import blocks.Block_TFFTCasing; -import blocks.Block_TFFTMultiHatch; -import blocks.Block_TFFTStorageFieldBlockT1; -import blocks.Block_TFFTStorageFieldBlockT2; -import blocks.Block_TFFTStorageFieldBlockT3; -import blocks.Block_TFFTStorageFieldBlockT4; -import blocks.Block_TFFTStorageFieldBlockT5; -import blocks.Block_ThaumiumReinforcedJar; -import blocks.Block_YSZUnit; +import common.blocks.Block_ControlRod; +import common.blocks.Block_GDCUnit; +import common.blocks.Block_IchorJar; +import common.blocks.Block_ItemProxyCable; +import common.blocks.Block_ItemProxyEndpoint; +import common.blocks.Block_ItemProxySource; +import common.blocks.Block_ItemServerDrive; +import common.blocks.Block_ItemServerIOPort; +import common.blocks.Block_ItemServerRackCasing; +import common.blocks.Block_ReactorChamber_OFF; +import common.blocks.Block_ReactorChamber_ON; +import common.blocks.Block_TFFTCasing; +import common.blocks.Block_TFFTMultiHatch; +import common.blocks.Block_TFFTStorageFieldBlockT1; +import common.blocks.Block_TFFTStorageFieldBlockT2; +import common.blocks.Block_TFFTStorageFieldBlockT3; +import common.blocks.Block_TFFTStorageFieldBlockT4; +import common.blocks.Block_TFFTStorageFieldBlockT5; +import common.blocks.Block_ThaumiumReinforcedJar; +import common.blocks.Block_YSZUnit; +import common.tileentities.GTMTE_FluidMultiStorage; +import common.tileentities.GTMTE_ItemServer; +import common.tileentities.GTMTE_ModularNuclearReactor; +import common.tileentities.GTMTE_SOFuelCellMK1; +import common.tileentities.GTMTE_SOFuelCellMK2; +import common.tileentities.TE_IchorJar; +import common.tileentities.TE_ItemProxyCable; +import common.tileentities.TE_ItemProxyEndpoint; +import common.tileentities.TE_ItemProxySource; +import common.tileentities.TE_ItemServerIOPort; +import common.tileentities.TE_TFFTMultiHatch; +import common.tileentities.TE_ThaumiumReinforcedJar; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -42,18 +54,6 @@ import items.MetaItem_ReactorComponent; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import render.ConduitRenderer; -import tileentities.GTMTE_FluidMultiStorage; -import tileentities.GTMTE_ItemServer; -import tileentities.GTMTE_ModularNuclearReactor; -import tileentities.GTMTE_SOFuelCellMK1; -import tileentities.GTMTE_SOFuelCellMK2; -import tileentities.TE_IchorJar; -import tileentities.TE_ItemProxyCable; -import tileentities.TE_ItemProxyEndpoint; -import tileentities.TE_ItemProxySource; -import tileentities.TE_ItemServerIOPort; -import tileentities.TE_TFFTMultiHatch; -import tileentities.TE_ThaumiumReinforcedJar; import util.Util; /** -- cgit From 27f5a01fd75c7019f220bdc44083766c27cf4180 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 22:00:02 +0200 Subject: shelved ItemServer for next release --- src/main/java/kekztech/KekzCore.java | 10 +++++----- src/main/java/kekztech/MultiItemHandler.java | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 55291eeadc..ad5ab24242 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -108,9 +108,9 @@ public class KekzCore { Block_ReactorChamber_OFF.getInstance().registerBlock(); Block_ReactorChamber_ON.getInstance().registerBlock(); Block_ControlRod.getInstance().registerBlock(); - Block_ItemServerDrive.getInstance().registerBlock(); - Block_ItemServerRackCasing.getInstance().registerBlock(); - Block_ItemServerIOPort.getInstance().registerBlock(); + //Block_ItemServerDrive.getInstance().registerBlock(); + //Block_ItemServerRackCasing.getInstance().registerBlock(); + //Block_ItemServerIOPort.getInstance().registerBlock(); Block_ItemProxyCable.getInstance().registerBlock(); Block_ItemProxySource.getInstance().registerBlock(); Block_ItemProxyEndpoint.getInstance().registerBlock(); @@ -120,7 +120,7 @@ public class KekzCore { // Register TileEntities GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile"); - GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile"); + //GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile"); GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile"); GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); @@ -139,7 +139,7 @@ public class KekzCore { sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II"); mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor"); fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T"); - is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server"); + //is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server"); // Register renderer ConduitRenderer.getInstance().registerRenderer(); } diff --git a/src/main/java/kekztech/MultiItemHandler.java b/src/main/java/kekztech/MultiItemHandler.java index 58dd0660e9..27d936efec 100644 --- a/src/main/java/kekztech/MultiItemHandler.java +++ b/src/main/java/kekztech/MultiItemHandler.java @@ -1,5 +1,8 @@ package kekztech; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.item.ItemStack; public class MultiItemHandler { @@ -14,6 +17,19 @@ public class MultiItemHandler { } + public List debugPrint() { + if(items == null) { + return new ArrayList(); + } + final ArrayList slots = new ArrayList<>(); + + for(int i = 0; i < items.length; i++) { + slots.add("Slot " + i + " contains " + items[i].stackSize + " " + items[i].getDisplayName()); + } + + return slots; + } + /** * Adapts the internal storage to structure changes. * In the event of structure down-sizing, all excess items @@ -22,6 +38,7 @@ public class MultiItemHandler { * @param itemTypeCapacity */ public void setItemTypeCapacity(int itemTypeCapacity) { + System.out.println("Configuring type capacity"); if(items.length > itemTypeCapacity) { // Generate new smaller backing array final ItemStack[] newItems = new ItemStack[itemTypeCapacity]; -- cgit From 34fb2f0b55c9295c116b1244224918624e56d096 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 23:39:52 +0200 Subject: Thaumcraft jar progress --- src/main/java/kekztech/KekzCore.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index ad5ab24242..eb725ed74f 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -90,7 +90,7 @@ public class KekzCore { ErrorItem.getInstance().registerItem(); MetaItem_ReactorComponent.getInstance().registerItem(); MetaItem_CraftingComponent.getInstance().registerItem(); - Item_Configurator.getInstance().registerItem(); + //Item_Configurator.getInstance().registerItem(); Items.registerOreDictNames(); Item_ThaumiumReinforcedJarFilled.getInstance().registerItem(); @@ -111,9 +111,9 @@ public class KekzCore { //Block_ItemServerDrive.getInstance().registerBlock(); //Block_ItemServerRackCasing.getInstance().registerBlock(); //Block_ItemServerIOPort.getInstance().registerBlock(); - Block_ItemProxyCable.getInstance().registerBlock(); - Block_ItemProxySource.getInstance().registerBlock(); - Block_ItemProxyEndpoint.getInstance().registerBlock(); + //Block_ItemProxyCable.getInstance().registerBlock(); + //Block_ItemProxySource.getInstance().registerBlock(); + //Block_ItemProxyEndpoint.getInstance().registerBlock(); Block_ThaumiumReinforcedJar.getInstance().registerBlock(); Block_IchorJar.getInstance().registerBlock(); @@ -121,9 +121,9 @@ public class KekzCore { // Register TileEntities GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile"); //GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile"); - GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile"); - GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); - GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); + //GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile"); + //GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile"); + //GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile"); GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar"); GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar"); @@ -141,7 +141,7 @@ public class KekzCore { fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T"); //is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server"); // Register renderer - ConduitRenderer.getInstance().registerRenderer(); + //ConduitRenderer.getInstance().registerRenderer(); } @Mod.EventHandler -- cgit From d42f4996255a4e11b2c0b5beabaf24be0d870fcc Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sat, 25 Apr 2020 18:35:08 +0200 Subject: improved jars are correctly placed after picking them up. Also cleaned up recipe registration --- src/main/java/kekztech/KekzCore.java | 347 +---------------------------------- 1 file changed, 7 insertions(+), 340 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index eb725ed74f..4d05961490 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -1,14 +1,9 @@ package kekztech; +import common.Recipes; import common.blocks.Block_ControlRod; import common.blocks.Block_GDCUnit; import common.blocks.Block_IchorJar; -import common.blocks.Block_ItemProxyCable; -import common.blocks.Block_ItemProxyEndpoint; -import common.blocks.Block_ItemProxySource; -import common.blocks.Block_ItemServerDrive; -import common.blocks.Block_ItemServerIOPort; -import common.blocks.Block_ItemServerRackCasing; import common.blocks.Block_ReactorChamber_OFF; import common.blocks.Block_ReactorChamber_ON; import common.blocks.Block_TFFTCasing; @@ -26,35 +21,18 @@ import common.tileentities.GTMTE_ModularNuclearReactor; import common.tileentities.GTMTE_SOFuelCellMK1; import common.tileentities.GTMTE_SOFuelCellMK2; import common.tileentities.TE_IchorJar; -import common.tileentities.TE_ItemProxyCable; -import common.tileentities.TE_ItemProxyEndpoint; -import common.tileentities.TE_ItemProxySource; -import common.tileentities.TE_ItemServerIOPort; import common.tileentities.TE_TFFTMultiHatch; import common.tileentities.TE_ThaumiumReinforcedJar; -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; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -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 gregtech.api.util.GT_Utility; import items.ErrorItem; -import items.Item_Configurator; import items.Item_ThaumiumReinforcedJarFilled; import items.MetaItem_CraftingComponent; import items.MetaItem_ReactorComponent; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import render.ConduitRenderer; -import util.Util; /** * My GT-Meta-IDs are: 13101 - 13500 @@ -77,12 +55,12 @@ public class KekzCore { @Mod.Instance("kekztech") public static KekzCore instance; - private GTMTE_SOFuelCellMK1 sofc1; - private GTMTE_SOFuelCellMK2 sofc2; + public static GTMTE_SOFuelCellMK1 sofc1; + public static GTMTE_SOFuelCellMK2 sofc2; @SuppressWarnings("unused") - private GTMTE_ModularNuclearReactor mdr; - private GTMTE_FluidMultiStorage fms; - private GTMTE_ItemServer is; + public static GTMTE_ModularNuclearReactor mdr; + public static GTMTE_FluidMultiStorage fms; + public static GTMTE_ItemServer is; @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { @@ -146,318 +124,7 @@ public class KekzCore { @Mod.EventHandler public void postInit(FMLPostInitializationEvent event) { - System.out.println("Registering KekzTech recipes..."); - - final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance(); - - // Multiblock Controllers - final Object[] mk1_recipe = { - "CCC", "PHP", "FBL", - 'C', OrePrefixes.circuit.get(Materials.Advanced), - '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) - }; - GT_ModHandler.addCraftingRecipe(sofc1.getStackForm(1), mk1_recipe); - final Object[] mk2_recipe = { - "CCC", "PHP", "FBL", - 'C', OrePrefixes.circuit.get(Materials.Master), - '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) - }; - GT_ModHandler.addCraftingRecipe(sofc2.getStackForm(1), mk2_recipe); - final Object[] tfft_recipe = { - "HFH", "PVP", "CFC", - 'H', OrePrefixes.pipeMedium.get(Materials.StainlessSteel), - '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) - }; - GT_ModHandler.addCraftingRecipe(fms.getStackForm(1), tfft_recipe); - /*final Object[] is_recipe = { - "FRF", "CGC", "PZP", - 'F', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), - 'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1), - 'C', ItemList.Conveyor_Module_LuV.get(1L), - 'G', ItemList.Field_Generator_EV.get(1L), - 'P', GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 1), - 'Z', GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1) - }; - GT_ModHandler.addCraftingRecipe(is.getStackForm(1), is_recipe);*/ - - - // Ceramic Electrolyte Units - final ItemStack[] yszUnit = { - GT_Utility.getIntegratedCircuit(6), - 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), - }; - GT_Values.RA.addAssemblerRecipe( - yszUnit, - Materials.Hydrogen.getGas(4000), - new ItemStack(Block_YSZUnit.getInstance(), 1), - 1200, 480); - final ItemStack[] gdcUnit = { - GT_Utility.getIntegratedCircuit(6), - 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), - }; - GT_Values.RA.addAssemblerRecipe( - gdcUnit, - Materials.Hydrogen.getGas(16000), - new ItemStack(Block_GDCUnit.getInstance(), 1), - 2400, 1920); - - // Item Server Structure blocks - /*final Object[] is_rack_recipe = { - "BRB", "CFC", "BRB", - 'B', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 1), - 'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 1), - 'C', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Platinum, 1), - 'F', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), - }; - GT_ModHandler.addCraftingRecipe(new ItemStack(Block_ItemServerRackCasing.getInstance()), is_rack_recipe); - final ItemStack[] is_ioport = { - GT_Utility.getIntegratedCircuit(6), - new ItemStack(Block_ItemServerRackCasing.getInstance()), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Platinum, 16), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Platinum, 2), - ItemList.Field_Generator_HV.get(1L), - ItemList.Robot_Arm_EV.get(4L) - }; - GT_Values.RA.addAssemblerRecipe( - is_ioport, - FluidRegistry.getFluidStack("molten.polytetrafluoroethylene", 144), - new ItemStack(Block_ItemServerIOPort.getInstance(), 1), - 200, 7680); - final Object[] is_blade = { - "CRC", "CMC", "HPH", - 'C', GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1), - 'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 1), - 'P', GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Platinum, 1), - 'M', ItemList.Electric_Motor_EV.get(1L), - 'H', craftingItem.getStackFromDamage(Items.BoronArsenideHeatPipe.getMetaID()), - }; - GT_ModHandler.addCraftingRecipe(craftingItem.getStackOfAmountFromDamage(Items.ItemServerBlade.getMetaID(), 8), is_blade); - final ItemStack[] is_drive = { - GT_Utility.getIntegratedCircuit(6), - craftingItem.getStackOfAmountFromDamage(Items.ItemServerBlade.getMetaID(), 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Aluminium, 16) - }; - GT_Values.RA.addAssemblerRecipe( - is_drive, - FluidRegistry.getFluidStack("molten.polyethylene", 1152), - new ItemStack(Block_ItemServerDrive.getInstance(), 1), - 200, 7680);*/ - - // T.F.F.T Structure blocks - final ItemStack[] tfftcasing = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - }; - GT_Values.RA.addAssemblerRecipe( - tfftcasing, - FluidRegistry.getFluidStack("molten.polytetrafluoroethylene", 144), - new ItemStack(Block_TFFTCasing.getInstance(), 1), - 200, 256); - final ItemStack[] tfftstoragefield1 = { - GT_Utility.getIntegratedCircuit(6), - 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) - }; - GT_Values.RA.addAssemblerRecipe( - tfftstoragefield1, - FluidRegistry.getFluidStack("molten.glass", 144), - new ItemStack(Block_TFFTStorageFieldBlockT1.getInstance(), 1), - 200, 256); - final ItemStack[] tfftstoragefield2 = { - GT_Utility.getIntegratedCircuit(6), - 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) - }; - GT_Values.RA.addAssemblerRecipe( - tfftstoragefield2, - FluidRegistry.getFluidStack("molten.plastic", 576), - new ItemStack(Block_TFFTStorageFieldBlockT2.getInstance(), 1), - 200, 480); - final ItemStack[] tfftstoragefield3 = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1), - ItemList.Field_Generator_MV.get(1L), - ItemList.Electric_Pump_HV.get(2L) - }; - GT_Values.RA.addAssemblerRecipe( - tfftstoragefield3, - FluidRegistry.getFluidStack("molten.epoxid", 576), - new ItemStack(Block_TFFTStorageFieldBlockT3.getInstance(), 1), - 300, 1920); - final ItemStack[] tfftstoragefield4 = { - GT_Utility.getIntegratedCircuit(6), - 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), - ItemList.Electric_Pump_EV.get(1L) - }; - GT_Values.RA.addAssemblerRecipe( - tfftstoragefield4, - FluidRegistry.getFluidStack("molten.epoxid", 1152), - new ItemStack(Block_TFFTStorageFieldBlockT4.getInstance(), 1), - 400, 4098); - final ItemStack[] tfftstoragefield5 = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4), - GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Enderium, 1), - ItemList.Field_Generator_EV.get(1L), - ItemList.Electric_Pump_IV.get(1L) - }; - GT_Values.RA.addAssemblerRecipe( - tfftstoragefield5, - FluidRegistry.getFluidStack("molten.epoxid", 1152), - new ItemStack(Block_TFFTStorageFieldBlockT5.getInstance(), 1), - 400, 6147); - final Object[] multi_hatch = { - "PRP", "UFU", "PRP", - 'P', GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 1), - 'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1), - 'U', ItemList.Electric_Pump_IV.get(1L), - 'F', ItemList.Field_Generator_HV.get(1L) - }; - GT_ModHandler.addCraftingRecipe(new ItemStack(Block_TFFTMultiHatch.getInstance()), multi_hatch); - - // Reactor structure blocks - final ItemStack[] controlrod = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Lead, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64) - }; - GT_Values.RA.addAssemblerRecipe( - controlrod, - null, - new ItemStack(Block_ControlRod.getInstance(), 1), - 800, 480); - final ItemStack[] reactorchamber = { - GT_Utility.getIntegratedCircuit(6), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Lead, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Lead, 9), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 18), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 2), - }; - GT_Values.RA.addAssemblerRecipe( - reactorchamber, - FluidRegistry.getFluidStack("wet.concrete", 144), - new ItemStack(Block_ReactorChamber_OFF.getInstance(), 1), - 1600, 480); - - // Ceramic plates - GT_Values.RA.addAlloySmelterRecipe( - craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), Loader.isModLoaded("bartworks") ? 3 : 10), - ItemList.Shape_Mold_Plate.get(0), - craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1), - 400, 480); - GT_Values.RA.addFormingPressRecipe( - craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10), - ItemList.Shape_Mold_Plate.get(0), - craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 1), - 800, 480); - - // Dusts - GT_Values.RA.addMixerRecipe(Materials.Boron.getDust(1), Materials.Arsenic.getDust(1), GT_Utility.getIntegratedCircuit(6), null, - null, null, craftingItem.getStackOfAmountFromDamage(Items.BoronArsenideDust.getMetaID(), 2), - 100, 1920); - GT_Values.RA.addChemicalRecipe( - Materials.Ammonia.getCells(2), - Materials.CarbonDioxide.getCells(1), - null, - null, - craftingItem.getStackOfAmountFromDamage(Items.AmineCarbamiteDust.getMetaID(), 1), - Util.getStackofAmountFromOreDict("cellEmpty", 3), - 400, 30); - GT_Values.RA.addChemicalRecipe( - craftingItem.getStackOfAmountFromDamage(Items.AmineCarbamiteDust.getMetaID(), 1), - Materials.Diamond.getDust(16), - Materials.CarbonDioxide.getGas(1000), - null, - craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondDust.getMetaID(), 1), - null, 1200, 480); - 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( - 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.GDCCeramicDust.getMetaID(), 10), - 400, 1920); - - // Crystals - GT_Values.RA.addAutoclaveRecipe( - craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondDust.getMetaID(), 4), - Materials.CarbonDioxide.getGas(16000), - craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondCrystal.getMetaID(), 1), 10000, 2400, 7680); - GT_Values.RA.addAutoclaveRecipe( - craftingItem.getStackOfAmountFromDamage(Items.BoronArsenideDust.getMetaID(), 4), - Materials.Nitrogen.getGas(4000), - craftingItem.getStackOfAmountFromDamage(Items.BoronArsenideCrystal.getMetaID(), 1), 10000, 2400, 1920); - - // Heat Pipes - GT_Values.RA.addLatheRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.AnnealedCopper, 1), - craftingItem.getStackFromDamage(Items.CopperHeatPipe.getMetaID()), - null, 120, 120); - GT_Values.RA.addLatheRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Silver, 1), - craftingItem.getStackFromDamage(Items.SilverHeatPipe.getMetaID()), - null, 120, 480); - GT_Values.RA.addLatheRecipe( - craftingItem.getStackOfAmountFromDamage(Items.BoronArsenideCrystal.getMetaID(), 4), - craftingItem.getStackFromDamage(Items.BoronArsenideHeatPipe.getMetaID()), - null, 1200, 1920); - GT_Values.RA.addLatheRecipe( - craftingItem.getStackOfAmountFromDamage(Items.IsotopicallyPureDiamondCrystal.getMetaID(), 4), - craftingItem.getStackFromDamage(Items.DiamondHeatPipe.getMetaID()), - null, 1200, 7680); - - System.out.println("...done"); + Recipes.init(); } } -- cgit From f5c4c0cc44b50c631eb044f12fae5032584620ed Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sat, 25 Apr 2020 19:52:46 +0200 Subject: huge refactor of recipe and block registration --- src/main/java/kekztech/KekzCore.java | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 4d05961490..8605d4f5b9 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -1,5 +1,6 @@ package kekztech; +import common.Blocks; import common.Recipes; import common.blocks.Block_ControlRod; import common.blocks.Block_GDCUnit; @@ -73,28 +74,7 @@ public class KekzCore { Item_ThaumiumReinforcedJarFilled.getInstance().registerItem(); - // Blocks - Block_YSZUnit.getInstance().registerBlock(); - Block_GDCUnit.getInstance().registerBlock(); - Block_TFFTCasing.getInstance().registerBlock(); - Block_TFFTStorageFieldBlockT1.getInstance().registerBlock(); - Block_TFFTStorageFieldBlockT2.getInstance().registerBlock(); - Block_TFFTStorageFieldBlockT3.getInstance().registerBlock(); - Block_TFFTStorageFieldBlockT4.getInstance().registerBlock(); - Block_TFFTStorageFieldBlockT5.getInstance().registerBlock(); - Block_TFFTMultiHatch.getInstance().registerBlock(); - Block_ReactorChamber_OFF.getInstance().registerBlock(); - Block_ReactorChamber_ON.getInstance().registerBlock(); - Block_ControlRod.getInstance().registerBlock(); - //Block_ItemServerDrive.getInstance().registerBlock(); - //Block_ItemServerRackCasing.getInstance().registerBlock(); - //Block_ItemServerIOPort.getInstance().registerBlock(); - //Block_ItemProxyCable.getInstance().registerBlock(); - //Block_ItemProxySource.getInstance().registerBlock(); - //Block_ItemProxyEndpoint.getInstance().registerBlock(); - - Block_ThaumiumReinforcedJar.getInstance().registerBlock(); - Block_IchorJar.getInstance().registerBlock(); + Blocks.init(); // Register TileEntities GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile"); -- cgit From d6d6dfa242d87c4488777887c31a3e6f66329946 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sat, 25 Apr 2020 22:07:31 +0200 Subject: crafting recipes and research for jars --- src/main/java/kekztech/KekzCore.java | 38 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 8605d4f5b9..cec9300812 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -2,20 +2,6 @@ package kekztech; import common.Blocks; import common.Recipes; -import common.blocks.Block_ControlRod; -import common.blocks.Block_GDCUnit; -import common.blocks.Block_IchorJar; -import common.blocks.Block_ReactorChamber_OFF; -import common.blocks.Block_ReactorChamber_ON; -import common.blocks.Block_TFFTCasing; -import common.blocks.Block_TFFTMultiHatch; -import common.blocks.Block_TFFTStorageFieldBlockT1; -import common.blocks.Block_TFFTStorageFieldBlockT2; -import common.blocks.Block_TFFTStorageFieldBlockT3; -import common.blocks.Block_TFFTStorageFieldBlockT4; -import common.blocks.Block_TFFTStorageFieldBlockT5; -import common.blocks.Block_ThaumiumReinforcedJar; -import common.blocks.Block_YSZUnit; import common.tileentities.GTMTE_FluidMultiStorage; import common.tileentities.GTMTE_ItemServer; import common.tileentities.GTMTE_ModularNuclearReactor; @@ -34,6 +20,10 @@ import items.ErrorItem; import items.Item_ThaumiumReinforcedJarFilled; import items.MetaItem_CraftingComponent; import items.MetaItem_ReactorComponent; +import net.minecraft.item.ItemStack; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; /** * My GT-Meta-IDs are: 13101 - 13500 @@ -51,7 +41,7 @@ public class KekzCore { public static final String NAME = "KekzTech"; public static final String MODID = "kekztech"; - public static final String VERSION = "0.2.3"; + public static final String VERSION = "0.3"; @Mod.Instance("kekztech") public static KekzCore instance; @@ -105,6 +95,22 @@ public class KekzCore { @Mod.EventHandler public void postInit(FMLPostInitializationEvent event) { Recipes.init(); + + // Thaumcraft research + final ResearchItem jar_thaumiumreinforced = new ResearchItem("THAUMIUMREINFORCEDJAR", "ALCHEMY", new AspectList(), 3, -4, 2, new ItemStack(Blocks.jarThaumiumReinforced, 1)); + jar_thaumiumreinforced.setPages(new ResearchPage[] { + new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR"), + new ResearchPage(Recipes.arcaneRecipes.get("THAUMIUMREINFORCEDJAR")) + }); + jar_thaumiumreinforced.setParents(new String[] {"JARLABEL"}); + jar_thaumiumreinforced.registerResearchItem(); + + final ResearchItem jar_ichor = new ResearchItem("ICHORJAR", "ALCHEMY", new AspectList(), 2, -5, 3, new ItemStack(Blocks.jarIchor, 1)); + jar_ichor.setPages(new ResearchPage[] { + new ResearchPage("kekztech.research_page.ICHORJAR"), + new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")) + }); + jar_ichor.setParents(new String[] {"THAUMIUMREINFORCEDJAR"}); + jar_ichor.registerResearchItem(); } - } -- cgit From c67bff76ebde860f368328c5e3b23caf1145a2a3 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Sun, 26 Apr 2020 01:51:39 +0200 Subject: fixed recipes for jars and wrote research lore --- src/main/java/kekztech/KekzCore.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index cec9300812..ff677a3296 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -35,6 +35,8 @@ import thaumcraft.api.research.ResearchPage; dependencies = "required-after:IC2; " + "required-after:gregtech;" + + "required-after:Thaumcraft;" + + "required-after:ThaumicTinkerer