From 2428b9387b77a959403fe5c2f5e84b2faa94a2e3 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 31 Aug 2018 11:33:23 +0200 Subject: add textures --- .../gregtech/textures/items/gt.metaitem.03/107.png | Bin 0 -> 3209 bytes .../gregtech/textures/items/gt.metaitem.03/76.png | Bin 0 -> 10545 bytes .../assets/gregtech/textures/items/gt.metaitem.03/8.png | Bin 0 -> 3193 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png new file mode 100644 index 0000000000..05825a9675 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png new file mode 100644 index 0000000000..8748b6dae4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png new file mode 100644 index 0000000000..570cf27d9a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png differ -- cgit From 9f030dcce750df9c5137e124a238f6de05e30af4 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 31 Aug 2018 12:45:44 +0200 Subject: More Bio Circuit parts --- src/main/java/gregtech/api/enums/ItemList.java | 4 ++-- src/main/java/gregtech/api/enums/Materials.java | 3 +++ .../gregtech/common/items/GT_MetaGenerated_Item_03.java | 4 ++++ .../loaders/postload/GT_MachineRecipeLoader.java | 2 ++ .../assets/gregtech/textures/items/gt.metaitem.03/68.png | Bin 0 -> 2969 bytes .../assets/gregtech/textures/items/gt.metaitem.03/77.png | Bin 0 -> 2910 bytes .../assets/gregtech/textures/items/gt.metaitem.03/97.png | Bin 0 -> 2984 bytes 7 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 2939454ecf..66d853f058 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -674,10 +674,10 @@ public enum ItemList implements IItemContainer { Circuit_Silicon_Ingot, Circuit_Silicon_Ingot2, Circuit_Silicon_Ingot3, Circuit_Silicon_Wafer, Circuit_Silicon_Wafer2, Circuit_Silicon_Wafer3, Circuit_Wafer_ILC, Circuit_Chip_ILC, Circuit_Wafer_Ram, Circuit_Chip_Ram, Circuit_Wafer_NAND, Circuit_Chip_NAND, Circuit_Wafer_NOR, Circuit_Chip_NOR, Circuit_Wafer_CPU, Circuit_Chip_CPU, Circuit_Wafer_SoC, Circuit_Chip_SoC, Circuit_Wafer_SoC2, Circuit_Chip_SoC2, Circuit_Wafer_PIC, Circuit_Chip_PIC, Circuit_Wafer_Simple_SoC, Circuit_Chip_Simple_SoC, Circuit_Wafer_HPIC, Circuit_Wafer_UHPIC, Circuit_Chip_HPIC, Circuit_Chip_UHPIC, Circuit_Wafer_NanoCPU, Circuit_Chip_NanoCPU, Circuit_Wafer_QuantumCPU, Circuit_Chip_QuantumCPU, - Circuit_Chip_CrystalCPU, Circuit_Chip_CrystalSoC, Circuit_Chip_NeuroCPU, Circuit_Chip_Stemcell, Circuit_Parts_RawCrystalParts, Circuit_Chip_Biocell, + Circuit_Chip_CrystalCPU, Circuit_Chip_CrystalSoC, Circuit_Chip_CrystalSoC2, Circuit_Chip_NeuroCPU, Circuit_Chip_BioCPU, Circuit_Chip_Stemcell, Circuit_Parts_RawCrystalParts, Circuit_Chip_Biocell, Tube_Wires, Circuit_Microprocessor, Circuit_Processor, Circuit_Computer, Circuit_Nanoprocessor, Circuit_Nanocomputer, Circuit_Elitenanocomputer, Circuit_Quantumprocessor, Circuit_Quantumcomputer, Circuit_Masterquantumcomputer, - Circuit_Quantummainframe, Circuit_Crystalprocessor, Circuit_Crystalcomputer, Circuit_Ultimatecrystalcomputer, Circuit_Crystalmainframe, Circuit_Neuroprocessor, Circuit_Wetwarecomputer, Circuit_Wetwaresupercomputer, Circuit_Wetwaremainframe, Circuit_Parts_RawCrystalChip, + Circuit_Quantummainframe, Circuit_Crystalprocessor, Circuit_Crystalcomputer, Circuit_Ultimatecrystalcomputer, Circuit_Crystalmainframe, Circuit_Neuroprocessor, Circuit_Wetwarecomputer, Circuit_Wetwaresupercomputer, Circuit_Wetwaremainframe, Circuit_Parts_RawCrystalChip, Circuit_Bioprocessor, Machine_LV_CircuitAssembler, Machine_MV_CircuitAssembler, Machine_HV_CircuitAssembler, Machine_EV_CircuitAssembler, Machine_IV_CircuitAssembler, Machine_LuV_CircuitAssembler, Machine_ZPM_CircuitAssembler, Machine_UV_CircuitAssembler, Circuit_Integrated_Good, Machine_IV_LightningRod, Machine_HV_LightningRod, Machine_EV_LightningRod, Depleted_MNq_1, Depleted_MNq_2, Depleted_MNq_4, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 2a74c1acdf..1daf1c7502 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -536,6 +536,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials HeavyFuel = new Materials( 741, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "HeavyFuel" , "Heavy Fuel" , 3, 240, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack).setCanBeCracked(true); public static Materials LPG = new Materials( 742, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "LPG" , "LPG" , 1, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ); + public static Materials BioMediumRaw = new MaterialBuilder(603, TextureSet.SET_FLUID , "Raw Bio Medium").setName("BioMediumRaw").addCell().addFluid().setRGB(97, 147, 46).setColor(Dyes.dyeLime).constructMaterial(); + public static Materials BioMediumSterilized = new MaterialBuilder(604, TextureSet.SET_FLUID , "Sterilized Bio Medium").setName("BiohMediumSterilized").addCell().addFluid().setRGB(162, 253, 53).setColor(Dyes.dyeLime).constructMaterial(); + public static Materials Chlorobenzene = new MaterialBuilder(605, TextureSet.SET_FLUID , "Chlorobenzene").addCell().addFluid().setRGB(0, 50, 65).setColor(Dyes.dyeGray).setMaterialList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 5), new MaterialStack(Chlorine, 1)).addElectrolyzerRecipe().constructMaterial(); public static Materials DilutedHydrochloricAcid = new MaterialBuilder(606, TextureSet.SET_FLUID , "Diluted Hydrochloric Acid").setName("DilutedHydrochloricAcid_GT5U").addCell().addFluid().setRGB(153, 167, 163).setColor(Dyes.dyeLightGray).setMaterialList(new MaterialStack(Hydrogen, 1), new MaterialStack(Chlorine, 1)).constructMaterial(); public static Materials Pyrochlore = new MaterialBuilder(607, TextureSet.SET_METALLIC , "Pyrochlore").addDustItems().addOreItems().setRGB(43, 17, 0).setColor(Dyes.dyeBlack).setMaterialList(new MaterialStack(Calcium, 2), new MaterialStack(Niobium, 2), new MaterialStack(Oxygen, 7)).addElectrolyzerRecipe().constructMaterial(); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 926ddded07..c6b6b3d22f 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -130,6 +130,7 @@ public class GT_MetaGenerated_Item_03 * SoCrystal * stem cells (disassemble eggs) */ + ItemList.Circuit_Chip_CrystalSoC2.set(addItem(tLastID = 68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); ItemList.Circuit_Parts_RawCrystalChip.set(addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o)); ItemList.Circuit_Chip_CrystalCPU.set(addItem(tLastID = 70, "Crystal Processing Unit", "Crystal CPU", o)); //Crystal chip elite part ItemList.Circuit_Chip_CrystalSoC.set(addItem(tLastID = 71, "Crystal SoC", "Crystal System on a Chip", o)); @@ -137,6 +138,7 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Chip_Stemcell.set(addItem(tLastID = 73, "Stemcells", "Raw Intiligence (Disassembled Eggs)", o)); ItemList.Circuit_Parts_RawCrystalParts.set(addItem(tLastID = 74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); ItemList.Circuit_Chip_Biocell.set(addItem(tLastID = 76, "Biocells", "Mutated Raw Intiligence", o)); + ItemList.Circuit_Chip_BioCPU.set(addItem(tLastID = 77, "Bio Processing Unit", "Bio CPU", o)); //Nand Chip ItemList.NandChip.set(addItem(tLastID = 75, "Nand Chip", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive), SubTag.NO_UNIFICATION})); @@ -177,6 +179,8 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Wetwaremainframe.set(addItem(tLastID = 95, "Wetware Mainframe", "An Infinite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION})); ItemList.Circuit_Ultimate.set(ItemList.Circuit_Ultimatecrystalcomputer.get(1L, new Object[0]));//maybe should be removed + ItemList.Circuit_Bioprocessor.set(addItem(tLastID = 97, "Bioprocessor", "A Ultimate Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Board_Coated_Basic.set(addItem(tLastID = 100, "Circuit Board", "A basic Circuit Board", o)); ItemList.Circuit_Board_Phenolic_Good.set(addItem(tLastID = 101, "Good Circuit Board", "A good Circuit Board", o)); ItemList.Circuit_Board_Epoxy_Advanced.set(addItem(tLastID = 102, "Advanced Circuit Board", "A advanced Circuit Board", o)); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 2e6763c824..8d55042be3 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -592,7 +592,9 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Cylinder.get(0, o), Materials.Polytetrafluoroethylene.getMolten(36), ItemList.Circuit_Parts_PetriDish.get(1, o), 160, 16); GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Cylinder.get(0, o), Materials.Polystyrene.getMolten(36), ItemList.Circuit_Parts_PetriDish.get(1, o), 160, 16); GT_Values.RA.addMixerRecipe(Materials.Sugar.getDust(4), Materials.MeatRaw.getDust(1), Materials.Salt.getDustTiny(1), GT_Values.NI, GT_ModHandler.getDistilledWater(4000), Materials.GrowthMediumRaw.getFluid(4000), GT_Values.NI, 160, 16); + GT_Values.RA.addMixerRecipe(Materials.MysteriousCrystal.getDust(4), Materials.Oriharukon.getDust(4), Materials.BlackPlutonium.getDustTiny(4), GT_ModHandler.getModItem("dreamcraft", "item.TCetiESeaweedExtract", 64L, 0), FluidRegistry.getFluidStack("mutagen", 4000), Materials.BioMediumRaw.getFluid(4000), GT_Values.NI, 160, 160); GT_Values.RA.addFluidHeaterRecipe(GT_Utility.getIntegratedCircuit(1), Materials.GrowthMediumRaw.getFluid(1000), Materials.GrowthMediumSterilized.getFluid(1000), 60, 24); + GT_Values.RA.addFluidHeaterRecipe(GT_Utility.getIntegratedCircuit(1), Materials.BioMediumRaw.getFluid(1000), Materials.BioMediumSterilized.getFluid(1000), 60, 240); GT_Values.RA.addFluidHeaterRecipe(GT_Utility.getIntegratedCircuit(1), FluidRegistry.getFluidStack("potion.dragonblood", 1000), Materials.GrowthMediumSterilized.getFluid(1000), 60, 24); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 1), 100, 120); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png new file mode 100644 index 0000000000..e505f31be8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png new file mode 100644 index 0000000000..d7c74e8f19 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png new file mode 100644 index 0000000000..be9e07ae7a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png differ -- cgit From 352e6c69d056dc0f6e165dbf1844da3810ebd144 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 31 Aug 2018 13:31:48 +0200 Subject: add reinforced Glass tubes add recipes for it --- src/main/java/gregtech/api/enums/ItemList.java | 2 +- src/main/java/gregtech/api/enums/Materials.java | 1 + .../gregtech/common/items/GT_MetaGenerated_Item_03.java | 3 ++- .../loaders/postload/GT_MachineRecipeLoader.java | 10 ++++++++++ .../assets/gregtech/textures/items/gt.metaitem.03/23.png | Bin 0 -> 3511 bytes 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 66d853f058..af88db972f 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -670,7 +670,7 @@ public enum ItemList implements IItemContainer { ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene, FluidRegulator_LV, FluidRegulator_MV, FluidRegulator_HV, FluidRegulator_EV, FluidRegulator_IV, FluidRegulator_LuV, FluidRegulator_ZPM, FluidRegulator_UV, FluidFilter, CuringOven, Machine_Multi_Assemblyline, Machine_Multi_DieselEngine, QuantumEye, QuantumStar, Gravistar, Block_SSFUEL, Block_MSSFUEL, SFMixture, MSFMixture, Depleted_Naquadah_1, Depleted_Naquadah_2, Depleted_Naquadah_4, NaquadahCell_1, NaquadahCell_2, NaquadahCell_4, Hatch_AutoMaintenance, Machine_Multi_Cleanroom, Circuit_Board_Coated, Circuit_Board_Coated_Basic, Circuit_Board_Phenolic, Circuit_Board_Phenolic_Good, Circuit_Board_Epoxy, Circuit_Board_Epoxy_Advanced, Circuit_Board_Fiberglass, Circuit_Board_Fiberglass_Advanced, Circuit_Board_Multifiberglass_Elite, Circuit_Board_Multifiberglass, Circuit_Board_Wetware, Circuit_Board_Wetware_Extreme, Circuit_Board_Plastic, Circuit_Board_Plastic_Advanced, Circuit_Board_Bio, Circuit_Board_Bio_Ultra, - Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Vacuum_Tube, NandChip, Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD, Circuit_Parts_GlassFiber, Circuit_Parts_PetriDish, + Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Reinforced_Glass_Tube, Circuit_Parts_Vacuum_Tube, NandChip, Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD, Circuit_Parts_GlassFiber, Circuit_Parts_PetriDish, Circuit_Silicon_Ingot, Circuit_Silicon_Ingot2, Circuit_Silicon_Ingot3, Circuit_Silicon_Wafer, Circuit_Silicon_Wafer2, Circuit_Silicon_Wafer3, Circuit_Wafer_ILC, Circuit_Chip_ILC, Circuit_Wafer_Ram, Circuit_Chip_Ram, Circuit_Wafer_NAND, Circuit_Chip_NAND, Circuit_Wafer_NOR, Circuit_Chip_NOR, Circuit_Wafer_CPU, Circuit_Chip_CPU, Circuit_Wafer_SoC, Circuit_Chip_SoC, Circuit_Wafer_SoC2, Circuit_Chip_SoC2, Circuit_Wafer_PIC, Circuit_Chip_PIC, Circuit_Wafer_Simple_SoC, Circuit_Chip_Simple_SoC, Circuit_Wafer_HPIC, Circuit_Wafer_UHPIC, Circuit_Chip_HPIC, Circuit_Chip_UHPIC, Circuit_Wafer_NanoCPU, Circuit_Chip_NanoCPU, Circuit_Wafer_QuantumCPU, Circuit_Chip_QuantumCPU, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 7a6b5bbe81..dfd2b17d54 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -536,6 +536,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials HeavyFuel = new Materials( 741, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "HeavyFuel" , "Heavy Fuel" , 3, 240, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack).setCanBeCracked(true); public static Materials LPG = new Materials( 742, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "LPG" , "LPG" , 1, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ); + public static Materials ReinforceGlass = new MaterialBuilder(602, TextureSet.SET_FLUID , "Molten Reinforced Glass").setName("ReinforcedGlass").addCell().addFluid().setRGB(192, 245, 254).setColor(Dyes.dyeWhite).setLiquidTemperature(2000).constructMaterial(); public static Materials BioMediumRaw = new MaterialBuilder(603, TextureSet.SET_FLUID , "Raw Bio Medium").setName("BioMediumRaw").addCell().addFluid().setRGB(97, 147, 46).setColor(Dyes.dyeLime).constructMaterial(); public static Materials BioMediumSterilized = new MaterialBuilder(604, TextureSet.SET_FLUID , "Sterilized Bio Medium").setName("BiohMediumSterilized").addCell().addFluid().setRGB(162, 253, 53).setColor(Dyes.dyeLime).constructMaterial(); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index c6b6b3d22f..6f7dd28d46 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -57,7 +57,8 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Parts_CapacitorSMD.set(addItem(tLastID = 20, "SMD Capacitor", "Electronic Component", o)); ItemList.Circuit_Parts_GlassFiber.set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o)); - + ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o)); +// /** * ICs diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 8d55042be3..caf3f66f6f 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1,6 +1,7 @@ package gregtech.loaders.postload; import codechicken.nei.api.API; +import com.dreammaster.gthandler.CustomItemList; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.GT_Mod; @@ -461,6 +462,10 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidExtractionRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L), GT_Values.NI, Materials.Mercury.getFluid(1000L), 10000, 128, 4); GT_Values.RA.addFluidExtractionRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Monazite, 1L), GT_Values.NI, Materials.Helium.getGas(200L), 10000, 64, 64); + GT_Values.RA.addFluidExtractionRecipe(GT_ModHandler.getIC2Item("blockAlloyGlass", 1L), GT_Values.NI, Materials.ReinforceGlass.getFluid(144), 10000, 100, 1920); + GT_Values.RA.addFluidExtractionRecipe(CustomItemList.ReinforcedGlassPLate.get(2L), GT_Values.NI, Materials.ReinforceGlass.getFluid(144), 10000, 75, 1920); + GT_Values.RA.addFluidExtractionRecipe(CustomItemList.ReinforcedGlassLense.get(2L), GT_Values.NI, Materials.ReinforceGlass.getFluid(144), 10000, 50, 1920); + GT_Values.RA.addFluidSmelterRecipe(new ItemStack(Items.snowball, 1, 0), GT_Values.NI, Materials.Water.getFluid(250L), 10000, 32, 4); GT_Values.RA.addFluidSmelterRecipe(new ItemStack(Blocks.snow, 1, 0), GT_Values.NI, Materials.Water.getFluid(1000L), 10000, 128, 4); GT_Values.RA.addFluidSmelterRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L), GT_Values.NI, Materials.Ice.getSolid(1000L), 10000, 128, 4); @@ -591,6 +596,10 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Cylinder.get(0, o), Materials.Polytetrafluoroethylene.getMolten(36), ItemList.Circuit_Parts_PetriDish.get(1, o), 160, 16); GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Cylinder.get(0, o), Materials.Polystyrene.getMolten(36), ItemList.Circuit_Parts_PetriDish.get(1, o), 160, 16); + + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Plate.get(0L, new Object[0]), Materials.ReinforceGlass.getMolten(72), CustomItemList.ReinforcedGlassPLate.get(1L),160, 1920); + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Block.get(0L, new Object[0]), Materials.ReinforceGlass.getMolten(144), GT_ModHandler.getIC2Item("blockAlloyGlass", 1L), 160, 1920); + GT_Values.RA.addMixerRecipe(Materials.Sugar.getDust(4), Materials.MeatRaw.getDust(1), Materials.Salt.getDustTiny(1), GT_Values.NI, GT_ModHandler.getDistilledWater(4000), Materials.GrowthMediumRaw.getFluid(4000), GT_Values.NI, 160, 16); GT_Values.RA.addMixerRecipe(Materials.MysteriousCrystal.getDust(4), Materials.Oriharukon.getDust(4), Materials.BlackPlutonium.getDustTiny(4), GT_ModHandler.getModItem("dreamcraft", "item.TCetiESeaweedExtract", 64L, 0), FluidRegistry.getFluidStack("mutagen", 4000), Materials.BioMediumRaw.getFluid(4000), GT_Values.NI, 160, 160); GT_Values.RA.addFluidHeaterRecipe(GT_Utility.getIntegratedCircuit(1), Materials.GrowthMediumRaw.getFluid(1000), Materials.GrowthMediumSterilized.getFluid(1000), 60, 24); @@ -800,6 +809,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalRecipe(ItemList.GelledToluene.get(4, new Object[0]), GT_Utility.getIntegratedCircuit(1), Materials.SulfuricAcid.getFluid(250), GT_Values.NF, new ItemStack(Blocks.tnt, 1), 200, 24); GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0L, new Object[0]), Materials.Glass.getMolten(144), ItemList.Circuit_Parts_Glass_Tube.get(1, new Object[0]), 200, 24); + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0L, new Object[0]), Materials.ReinforceGlass.getFluid(288), ItemList.Circuit_Parts_Reinforced_Glass_Tube.get(1, new Object[0]), 200, 240); GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0L, new Object[0]), FluidRegistry.getFluidStack("glass.molten", 1000), ItemList.Circuit_Parts_Glass_Tube.get(1, new Object[0]), 200, 24); GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0L, new Object[0]), new FluidStack(ItemList.sToluene, 100), ItemList.GelledToluene.get(1, new Object[0]), 100, 16); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png new file mode 100644 index 0000000000..28beb6060d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png differ -- cgit From 9ee6433e4080921dbb0f6a0c8da30f3eb055b0d7 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 31 Aug 2018 22:33:37 +0200 Subject: Added new Solar Panels from UHV to UIV (no recipes yet) --- src/main/java/gregtech/api/enums/ItemList.java | 3 +++ src/main/java/gregtech/api/enums/Textures.java | 2 +- .../common/items/GT_MetaGenerated_Item_01.java | 6 ++++++ .../textures/blocks/iconsets/SOLARPANEL_UEV.png | Bin 0 -> 178 bytes .../textures/blocks/iconsets/SOLARPANEL_UHV.png | Bin 0 -> 178 bytes .../textures/blocks/iconsets/SOLARPANEL_UIV.png | Bin 0 -> 178 bytes .../gregtech/textures/items/gt.metaitem.01/750.png | Bin 434 -> 3146 bytes .../gregtech/textures/items/gt.metaitem.01/751.png | Bin 478 -> 3181 bytes .../gregtech/textures/items/gt.metaitem.01/752.png | Bin 447 -> 3154 bytes .../gregtech/textures/items/gt.metaitem.01/753.png | Bin 462 -> 3188 bytes .../gregtech/textures/items/gt.metaitem.01/754.png | Bin 459 -> 3176 bytes .../gregtech/textures/items/gt.metaitem.01/755.png | Bin 463 -> 3160 bytes .../gregtech/textures/items/gt.metaitem.01/756.png | Bin 466 -> 3168 bytes .../gregtech/textures/items/gt.metaitem.01/757.png | Bin 464 -> 3187 bytes .../gregtech/textures/items/gt.metaitem.01/758.png | Bin 477 -> 3195 bytes .../gregtech/textures/items/gt.metaitem.01/759.png | Bin 444 -> 3151 bytes .../gregtech/textures/items/gt.metaitem.01/770.png | Bin 0 -> 3197 bytes .../gregtech/textures/items/gt.metaitem.01/771.png | Bin 0 -> 3222 bytes .../gregtech/textures/items/gt.metaitem.01/772.png | Bin 0 -> 3198 bytes 19 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index af88db972f..80cd537b08 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -416,6 +416,9 @@ public enum ItemList implements IItemContainer { Cover_SolarPanel_LuV, Cover_SolarPanel_ZPM, Cover_SolarPanel_UV, + Cover_SolarPanel_UHV, + Cover_SolarPanel_UEV, + Cover_SolarPanel_UIV, Ingot_IridiumAlloy, Plank_Oak, Plank_Spruce, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 9bd00b2836..15609b3ff6 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -35,7 +35,7 @@ public class Textures { VOID // The Empty Texture , RENDERING_ERROR, PIPE_RESTRICTOR, INSULATION_FULL, INSULATION_TINY, INSULATION_SMALL, INSULATION_MEDIUM, INSULATION_MEDIUM_PLUS, INSULATION_LARGE, INSULATION_HUGE, CFOAM_FRESH, CFOAM_HARDENED, SOLARPANEL, SOLARPANEL_8V, SOLARPANEL_LV, SOLARPANEL_MV, SOLARPANEL_HV, SOLARPANEL_EV, SOLARPANEL_IV, SOLARPANEL_LuV, SOLARPANEL_ZPM, - SOLARPANEL_UV, VENT_NORMAL, VENT_ADVANCED, COVER_WOOD_PLATE, ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT, AUTOMATION_FILTER, AUTOMATION_TYPEFILTER, + SOLARPANEL_UV, SOLARPANEL_UHV, SOLARPANEL_UEV, SOLARPANEL_UIV, VENT_NORMAL, VENT_ADVANCED, COVER_WOOD_PLATE, ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT, AUTOMATION_FILTER, AUTOMATION_TYPEFILTER, AUTOMATION_CHESTBUFFER, AUTOMATION_SUPERBUFFER, AUTOMATION_REGULATOR, AUTOMATION_ITEMDISTRIBUTOR, CONCRETE_LIGHT_STONE, CONCRETE_LIGHT_COBBLE, CONCRETE_LIGHT_COBBLE_MOSSY, CONCRETE_LIGHT_BRICKS, CONCRETE_LIGHT_BRICKS_CRACKED, CONCRETE_LIGHT_BRICKS_MOSSY, CONCRETE_LIGHT_BRICKS_CHISELED, CONCRETE_LIGHT_SMOOTH, CONCRETE_DARK_STONE, CONCRETE_DARK_COBBLE, CONCRETE_DARK_COBBLE_MOSSY, CONCRETE_DARK_BRICKS, CONCRETE_DARK_BRICKS_CRACKED, CONCRETE_DARK_BRICKS_MOSSY, CONCRETE_DARK_BRICKS_CHISELED, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index db26ca6e71..8a00dc60b6 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -799,6 +799,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_SolarPanel_LuV.set(addItem(tLastID = 757, "Solar Panel (LuV)", "Ludicrous Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)})); ItemList.Cover_SolarPanel_ZPM.set(addItem(tLastID = 758, "Solar Panel (ZPM)", "ZPM Voltage Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)})); ItemList.Cover_SolarPanel_UV.set(addItem(tLastID = 759, "Solar Panel (UV)", "Ultimate Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)})); + ItemList.Cover_SolarPanel_UHV.set(addItem(tLastID = 770, "Solar Panel (UHV)", "UHV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L)})); + ItemList.Cover_SolarPanel_UEV.set(addItem(tLastID = 771, "Solar Panel (UEV)", "UEV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L)})); + ItemList.Cover_SolarPanel_UIV.set(addItem(tLastID = 772, "Solar Panel (UIV)", "UIV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 512L)})); GregTech_API.registerCover(ItemList.Cover_SolarPanel.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL), new GT_Cover_SolarPanel(1)); GregTech_API.registerCover(ItemList.Cover_SolarPanel_8V.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V), new GT_Cover_SolarPanel(8)); @@ -810,6 +813,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GregTech_API.registerCover(ItemList.Cover_SolarPanel_LuV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV), new GT_Cover_SolarPanel(32768)); GregTech_API.registerCover(ItemList.Cover_SolarPanel_ZPM.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM), new GT_Cover_SolarPanel(131072)); GregTech_API.registerCover(ItemList.Cover_SolarPanel_UV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV), new GT_Cover_SolarPanel(524288)); + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UHV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UHV), new GT_Cover_SolarPanel(2097152)); + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UEV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UEV), new GT_Cover_SolarPanel(8388608)); + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UIV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UIV), new GT_Cover_SolarPanel(33554432)); ItemList.Tool_Sonictron.set(addItem(tLastID = 760, "Sonictron", "Bring your Music with you", new Object[]{Behaviour_Sonictron.INSTANCE, new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4L)})); ItemList.Tool_Cheat.set(addItem(tLastID = 761, "Debug Scanner", "Also an Infinite Energy Source", new Object[]{Behaviour_Scanner.INSTANCE, new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 64L)})); diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png new file mode 100644 index 0000000000..e3dcb7b2c9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png new file mode 100644 index 0000000000..e3dcb7b2c9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png new file mode 100644 index 0000000000..e3dcb7b2c9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png index 2106b2533c..ce0df610fb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png index f3e0b5f67e..1ecbb6373e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png index 3aed0ef200..d4412d6858 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png index 03d271872e..7f64ef3e5c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png index dd87199ae2..1a57bf6f1f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png index 5b9053e1f4..4ac360c41e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png index 23c87b8a2d..766b2b9be7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png index 511366e648..a264ff97bb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png index d8d2012c51..1a78bbdfc2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png index 1e538bce45..e28d6cc462 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png new file mode 100644 index 0000000000..f5fbb61eda Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png new file mode 100644 index 0000000000..6506e3e460 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png new file mode 100644 index 0000000000..11bd87f69a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png differ -- cgit From 63ed1693879e90953210080e90118c2d847c28cb Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 2 Sep 2018 16:38:56 +0200 Subject: reduce solar cover texture to 16x16 --- .../gregtech/textures/items/gt.metaitem.01/750.png | Bin 3146 -> 3093 bytes .../gregtech/textures/items/gt.metaitem.01/751.png | Bin 3181 -> 3137 bytes .../gregtech/textures/items/gt.metaitem.01/752.png | Bin 3154 -> 3107 bytes .../gregtech/textures/items/gt.metaitem.01/753.png | Bin 3188 -> 3121 bytes .../gregtech/textures/items/gt.metaitem.01/754.png | Bin 3176 -> 3118 bytes .../gregtech/textures/items/gt.metaitem.01/755.png | Bin 3160 -> 3122 bytes .../gregtech/textures/items/gt.metaitem.01/756.png | Bin 3168 -> 3125 bytes .../gregtech/textures/items/gt.metaitem.01/757.png | Bin 3187 -> 3123 bytes .../gregtech/textures/items/gt.metaitem.01/758.png | Bin 3195 -> 3136 bytes .../gregtech/textures/items/gt.metaitem.01/759.png | Bin 3151 -> 3104 bytes .../gregtech/textures/items/gt.metaitem.01/770.png | Bin 3197 -> 3118 bytes .../gregtech/textures/items/gt.metaitem.01/771.png | Bin 3222 -> 3137 bytes .../gregtech/textures/items/gt.metaitem.01/772.png | Bin 3198 -> 3123 bytes 13 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png index ce0df610fb..e14156d0f9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png index 1ecbb6373e..7fc79276ee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png index d4412d6858..edf04adc3d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png index 7f64ef3e5c..d181c017ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png index 1a57bf6f1f..190c30550b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png index 4ac360c41e..7bd3b543a4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png index 766b2b9be7..f7187595f1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png index a264ff97bb..93c9ca2bf3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png index 1a78bbdfc2..52df2bd8a2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png index e28d6cc462..abf9e56ba7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png index f5fbb61eda..fe039142e0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png index 6506e3e460..2fad5c9386 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png index 11bd87f69a..08ff840ea5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png differ -- cgit From 1b14aa1673814339cbdcc39d77530eff0c11ad6e Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 2 Sep 2018 17:04:04 +0200 Subject: fix solar panels --- .../gregtech/common/items/GT_MetaGenerated_Item_01.java | 6 ------ .../gregtech/common/items/GT_MetaGenerated_Item_02.java | 10 ++++++++++ .../gregtech/textures/items/gt.metaitem.01/770.png | Bin 3118 -> 0 bytes .../gregtech/textures/items/gt.metaitem.01/771.png | Bin 3137 -> 0 bytes .../gregtech/textures/items/gt.metaitem.01/772.png | Bin 3123 -> 0 bytes .../gregtech/textures/items/gt.metaitem.02/770.png | Bin 0 -> 3118 bytes .../gregtech/textures/items/gt.metaitem.02/771.png | Bin 0 -> 3137 bytes .../gregtech/textures/items/gt.metaitem.02/772.png | Bin 0 -> 3123 bytes 8 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 8a00dc60b6..db26ca6e71 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -799,9 +799,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_SolarPanel_LuV.set(addItem(tLastID = 757, "Solar Panel (LuV)", "Ludicrous Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)})); ItemList.Cover_SolarPanel_ZPM.set(addItem(tLastID = 758, "Solar Panel (ZPM)", "ZPM Voltage Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)})); ItemList.Cover_SolarPanel_UV.set(addItem(tLastID = 759, "Solar Panel (UV)", "Ultimate Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)})); - ItemList.Cover_SolarPanel_UHV.set(addItem(tLastID = 770, "Solar Panel (UHV)", "UHV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L)})); - ItemList.Cover_SolarPanel_UEV.set(addItem(tLastID = 771, "Solar Panel (UEV)", "UEV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L)})); - ItemList.Cover_SolarPanel_UIV.set(addItem(tLastID = 772, "Solar Panel (UIV)", "UIV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 512L)})); GregTech_API.registerCover(ItemList.Cover_SolarPanel.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL), new GT_Cover_SolarPanel(1)); GregTech_API.registerCover(ItemList.Cover_SolarPanel_8V.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V), new GT_Cover_SolarPanel(8)); @@ -813,9 +810,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GregTech_API.registerCover(ItemList.Cover_SolarPanel_LuV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV), new GT_Cover_SolarPanel(32768)); GregTech_API.registerCover(ItemList.Cover_SolarPanel_ZPM.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM), new GT_Cover_SolarPanel(131072)); GregTech_API.registerCover(ItemList.Cover_SolarPanel_UV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV), new GT_Cover_SolarPanel(524288)); - GregTech_API.registerCover(ItemList.Cover_SolarPanel_UHV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UHV), new GT_Cover_SolarPanel(2097152)); - GregTech_API.registerCover(ItemList.Cover_SolarPanel_UEV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UEV), new GT_Cover_SolarPanel(8388608)); - GregTech_API.registerCover(ItemList.Cover_SolarPanel_UIV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UIV), new GT_Cover_SolarPanel(33554432)); ItemList.Tool_Sonictron.set(addItem(tLastID = 760, "Sonictron", "Bring your Music with you", new Object[]{Behaviour_Sonictron.INSTANCE, new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4L)})); ItemList.Tool_Cheat.set(addItem(tLastID = 761, "Debug Scanner", "Also an Infinite Energy Source", new Object[]{Behaviour_Scanner.INSTANCE, new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 64L)})); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 698b48e5e2..736af7f3a2 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -4,9 +4,11 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.items.GT_MetaGenerated_Item_X32; import gregtech.api.objects.GT_CopiedBlockTexture; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; import gregtech.api.util.*; +import gregtech.common.covers.GT_Cover_SolarPanel; import gregtech.common.items.behaviors.Behaviour_Arrow; import net.minecraft.dispenser.IBlockSource; import net.minecraft.enchantment.Enchantment; @@ -390,6 +392,14 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { } } ItemList.Display_ITS_FREE.set(addItem(tLastID = 766, "ITS FREE", "(or at least almost free)", new Object[]{SubTag.INVISIBLE, new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)})); + + ItemList.Cover_SolarPanel_UHV.set(addItem(tLastID = 770, "Solar Panel (UHV)", "UHV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L)})); + ItemList.Cover_SolarPanel_UEV.set(addItem(tLastID = 771, "Solar Panel (UEV)", "UEV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L)})); + ItemList.Cover_SolarPanel_UIV.set(addItem(tLastID = 772, "Solar Panel (UIV)", "UIV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 512L)})); + + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UHV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UHV), new GT_Cover_SolarPanel(2097152)); + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UEV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UEV), new GT_Cover_SolarPanel(8388608)); + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UIV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UIV), new GT_Cover_SolarPanel(33554432)); } public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png deleted file mode 100644 index fe039142e0..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png deleted file mode 100644 index 2fad5c9386..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png deleted file mode 100644 index 08ff840ea5..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png new file mode 100644 index 0000000000..fe039142e0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png new file mode 100644 index 0000000000..2fad5c9386 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png new file mode 100644 index 0000000000..08ff840ea5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png differ -- cgit From 22c026c31f4860fe3525aba74ac1728e706945d7 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 2 Sep 2018 17:58:39 +0200 Subject: add new circuit --- src/main/java/gregtech/api/enums/ItemList.java | 1 + .../gregtech/common/items/GT_MetaGenerated_Item_03.java | 1 + .../assets/gregtech/textures/items/gt.metaitem.03/98.png | Bin 0 -> 3028 bytes 3 files changed, 2 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 16b7502ea2..0bb56f3d26 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -363,6 +363,7 @@ public enum ItemList implements IItemContainer { Circuit_Elite, Circuit_Master, Circuit_Ultimate, + Circuit_Biowarecomputer, Rotor_LV, Rotor_MV, Rotor_HV, Rotor_EV, Rotor_IV, Rotor_LuV, Rotor_ZPM, Rotor_UV, Electric_Motor_LV, Electric_Motor_MV, Electric_Motor_HV, Electric_Motor_EV, Electric_Motor_IV, Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_UHV, Electric_Pump_LV, Electric_Pump_MV, Electric_Pump_HV, Electric_Pump_EV, Electric_Pump_IV, Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, Electric_Pump_UHV, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index ec2a578760..5c47312c9e 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -179,6 +179,7 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Wetwaresupercomputer.set(addItem(tLastID = 94, "Wetware Supercomputer", "A Super Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION})); ItemList.Circuit_Wetwaremainframe.set(addItem(tLastID = 95, "Wetware Mainframe", "An Infinite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION})); ItemList.Circuit_Ultimate.set(ItemList.Circuit_Ultimatecrystalcomputer.get(1L, new Object[0]));//maybe should be removed + ItemList.Circuit_Biowarecomputer.set(addItem(tLastID = 98, "Biowareprocessor Assembly", "A Super Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION})); ItemList.Circuit_Bioprocessor.set(addItem(tLastID = 97, "Bioprocessor", "A Ultimate Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION})); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png new file mode 100644 index 0000000000..f53e236793 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png differ -- cgit From 3e2c455fa36706af4103ddfc98b9921f4b0f1436 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 2 Sep 2018 20:24:14 +0200 Subject: add more circuits --- src/main/java/gregtech/api/enums/ItemList.java | 3 ++- .../gregtech/common/items/GT_MetaGenerated_Item_03.java | 2 ++ .../gregtech/textures/items/gt.metaitem.03/120.png | Bin 0 -> 6682 bytes .../assets/gregtech/textures/items/gt.metaitem.03/99.png | Bin 0 -> 3732 bytes 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 0bb56f3d26..4e8ba9eef5 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -364,6 +364,7 @@ public enum ItemList implements IItemContainer { Circuit_Master, Circuit_Ultimate, Circuit_Biowarecomputer, + Circuit_Biowaresupercomputer, Rotor_LV, Rotor_MV, Rotor_HV, Rotor_EV, Rotor_IV, Rotor_LuV, Rotor_ZPM, Rotor_UV, Electric_Motor_LV, Electric_Motor_MV, Electric_Motor_HV, Electric_Motor_EV, Electric_Motor_IV, Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_UHV, Electric_Pump_LV, Electric_Pump_MV, Electric_Pump_HV, Electric_Pump_EV, Electric_Pump_IV, Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, Electric_Pump_UHV, @@ -681,7 +682,7 @@ public enum ItemList implements IItemContainer { Circuit_Chip_CrystalCPU, Circuit_Chip_CrystalSoC, Circuit_Chip_CrystalSoC2, Circuit_Chip_NeuroCPU, Circuit_Chip_BioCPU, Circuit_Chip_Stemcell, Circuit_Parts_RawCrystalParts, Circuit_Chip_Biocell, Tube_Wires, Circuit_Microprocessor, Circuit_Processor, Circuit_Computer, Circuit_Nanoprocessor, Circuit_Nanocomputer, Circuit_Elitenanocomputer, Circuit_Quantumprocessor, Circuit_Quantumcomputer, Circuit_Masterquantumcomputer, - Circuit_Quantummainframe, Circuit_Crystalprocessor, Circuit_Crystalcomputer, Circuit_Ultimatecrystalcomputer, Circuit_Crystalmainframe, Circuit_Neuroprocessor, Circuit_Wetwarecomputer, Circuit_Wetwaresupercomputer, Circuit_Wetwaremainframe, Circuit_Parts_RawCrystalChip, Circuit_Bioprocessor, + Circuit_Quantummainframe, Circuit_Crystalprocessor, Circuit_Crystalcomputer, Circuit_Ultimatecrystalcomputer, Circuit_Crystalmainframe, Circuit_Neuroprocessor, Circuit_Wetwarecomputer, Circuit_Wetwaresupercomputer, Circuit_Wetwaremainframe, Circuit_Parts_RawCrystalChip, Circuit_Bioprocessor, Circuit_Biomainframe, Machine_LV_CircuitAssembler, Machine_MV_CircuitAssembler, Machine_HV_CircuitAssembler, Machine_EV_CircuitAssembler, Machine_IV_CircuitAssembler, Machine_LuV_CircuitAssembler, Machine_ZPM_CircuitAssembler, Machine_UV_CircuitAssembler, Circuit_Integrated_Good, Machine_IV_LightningRod, Machine_HV_LightningRod, Machine_EV_LightningRod, Depleted_MNq_1, Depleted_MNq_2, Depleted_MNq_4, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 5c47312c9e..84c73ecd38 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -180,6 +180,7 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Wetwaremainframe.set(addItem(tLastID = 95, "Wetware Mainframe", "An Infinite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION})); ItemList.Circuit_Ultimate.set(ItemList.Circuit_Ultimatecrystalcomputer.get(1L, new Object[0]));//maybe should be removed ItemList.Circuit_Biowarecomputer.set(addItem(tLastID = 98, "Biowareprocessor Assembly", "A Super Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION})); + ItemList.Circuit_Biowaresupercomputer.set(addItem(tLastID = 99, "Bioware Supercomputer", "A Infinite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION})); ItemList.Circuit_Bioprocessor.set(addItem(tLastID = 97, "Bioprocessor", "A Ultimate Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION})); @@ -191,6 +192,7 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Board_Wetware_Extreme.set(addItem(tLastID = 105, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); ItemList.Circuit_Board_Plastic_Advanced.set(addItem(tLastID = 106, "Plastic Circuit Board", "A good Board", o)); ItemList.Circuit_Board_Bio_Ultra.set(addItem(tLastID = 107, "Ultra Bio Mutted Circuit Board", "Bio genetic mutated Board", o)); + ItemList.Circuit_Biomainframe.set(addItem(tLastID = 120, "Bio Mainframe", "A Bio Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION})); ItemList.Tube_Wires.set(addItem(tLastID = 110, "Tube Wires", "For the Vacuum Tubes", o)); } diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png new file mode 100644 index 0000000000..f91bcd2f26 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png new file mode 100644 index 0000000000..467fc0c666 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png differ -- cgit From ada00dc070c2db01e6d96f6269f32cad83bd0e06 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 2 Sep 2018 21:46:11 +0200 Subject: change solar pannels to meta generated items 03 add ass line localizer for items --- .../common/items/GT_MetaGenerated_Item_02.java | 10 +--------- .../common/items/GT_MetaGenerated_Item_03.java | 17 +++++++++++++---- src/main/resources/assets/gregtech/lang/en_US.lang | 6 ++++++ .../gregtech/textures/items/gt.metaitem.02/770.png | Bin 3118 -> 0 bytes .../gregtech/textures/items/gt.metaitem.02/771.png | Bin 3137 -> 0 bytes .../gregtech/textures/items/gt.metaitem.02/772.png | Bin 3123 -> 0 bytes .../gregtech/textures/items/gt.metaitem.03/130.png | Bin 0 -> 3118 bytes .../gregtech/textures/items/gt.metaitem.03/131.png | Bin 0 -> 3137 bytes .../gregtech/textures/items/gt.metaitem.03/132.png | Bin 0 -> 3123 bytes 9 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 736af7f3a2..c9ceea3536 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -392,15 +392,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { } } ItemList.Display_ITS_FREE.set(addItem(tLastID = 766, "ITS FREE", "(or at least almost free)", new Object[]{SubTag.INVISIBLE, new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)})); - - ItemList.Cover_SolarPanel_UHV.set(addItem(tLastID = 770, "Solar Panel (UHV)", "UHV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L)})); - ItemList.Cover_SolarPanel_UEV.set(addItem(tLastID = 771, "Solar Panel (UEV)", "UEV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L)})); - ItemList.Cover_SolarPanel_UIV.set(addItem(tLastID = 772, "Solar Panel (UIV)", "UIV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 512L)})); - - GregTech_API.registerCover(ItemList.Cover_SolarPanel_UHV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UHV), new GT_Cover_SolarPanel(2097152)); - GregTech_API.registerCover(ItemList.Cover_SolarPanel_UEV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UEV), new GT_Cover_SolarPanel(8388608)); - GregTech_API.registerCover(ItemList.Cover_SolarPanel_UIV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UIV), new GT_Cover_SolarPanel(33554432)); - } +} public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { super.onLeftClickEntity(aStack, aPlayer, aEntity); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 84c73ecd38..38fc49b0d7 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -1,10 +1,10 @@ package gregtech.common.items; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; +import gregtech.api.GregTech_API; +import gregtech.api.enums.*; import gregtech.api.items.GT_MetaGenerated_Item_X32; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.common.covers.GT_Cover_SolarPanel; public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { @@ -195,6 +195,15 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Biomainframe.set(addItem(tLastID = 120, "Bio Mainframe", "A Bio Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION})); ItemList.Tube_Wires.set(addItem(tLastID = 110, "Tube Wires", "For the Vacuum Tubes", o)); + + ItemList.Cover_SolarPanel_UHV.set(addItem(tLastID = 130, "Solar Panel (UHV)", "UHV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L)})); + ItemList.Cover_SolarPanel_UEV.set(addItem(tLastID = 131, "Solar Panel (UEV)", "UEV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L)})); + ItemList.Cover_SolarPanel_UIV.set(addItem(tLastID = 132, "Solar Panel (UIV)", "UIV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 512L)})); + + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UHV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UHV), new GT_Cover_SolarPanel(2097152)); + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UEV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UEV), new GT_Cover_SolarPanel(8388608)); + GregTech_API.registerCover(ItemList.Cover_SolarPanel_UIV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UIV), new GT_Cover_SolarPanel(33554432)); + } public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index de3a19fdec..0e0a8313e4 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -734,9 +734,15 @@ achievement.gt.blockmachines.fusioncomputer.tier.08=Fusion Computer Mark III achievement.gt.blockmachines.fusioncomputer.tier.08.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.03.32072=Neuro Processing Unit +achievement.gt.metaitem.03.32077.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32077=Bio Processing Unit achievement.gt.metaitem.03.32072.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.03.32095=Wetware Mainframe achievement.gt.metaitem.03.32095.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32099=Bioware Supercomputer +achievement.gt.metaitem.03.32099.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32120=Bio Mainframe +achievement.gt.metaitem.03.32120.desc=Pickup this item to see the recipe in NEI achievement.item.NanoCircuit=Nano Circuit achievement.item.NanoCircuit.desc=Pickup this item to see the recipe in NEI diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png deleted file mode 100644 index fe039142e0..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png deleted file mode 100644 index 2fad5c9386..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png deleted file mode 100644 index 08ff840ea5..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png new file mode 100644 index 0000000000..fe039142e0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png new file mode 100644 index 0000000000..2fad5c9386 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png new file mode 100644 index 0000000000..08ff840ea5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png differ -- cgit