diff options
Diffstat (limited to 'src/main/java')
57 files changed, 8210 insertions, 87 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java b/src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java index a6b34660f0..239231ad3c 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java +++ b/src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java @@ -35,4 +35,8 @@ public class PhotolithographicMask extends Item implements ICanFocus { } + public String getDescSpectrum() { + return descSpectrum; + } + } diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index b3dea32ca7..5b6ebe0a20 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -113,6 +113,7 @@ import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; import static gregtech.api.util.GT_RecipeConstants.DISSOLUTION_TANK_RATIO; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GT_RecipeConstants.WaferEngravingRecipes; import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.simpleWasherRecipes; @@ -609,7 +610,7 @@ public class RecipeLoader { .duration(60 * GT_RecipeBuilder.SECONDS) .eut(1920) .requiresCleanRoom() - .addTo(laserEngraverRecipes); + .addTo(WaferEngravingRecipes); } @@ -748,7 +749,7 @@ public class RecipeLoader { .requiresCleanRoom() .duration(120 * SECONDS) .eut(1920) - .addTo(laserEngraverRecipes); + .addTo(WaferEngravingRecipes); } else if (mask == MaskList.NOR) { @@ -760,7 +761,7 @@ public class RecipeLoader { .requiresCleanRoom() .duration(120 * SECONDS) .eut(1920) - .addTo(laserEngraverRecipes); + .addTo(WaferEngravingRecipes); } @@ -778,7 +779,7 @@ public class RecipeLoader { .requiresCleanRoom() .duration(120 * SECONDS) .eut(1920) - .addTo(laserEngraverRecipes); + .addTo(WaferEngravingRecipes); } } diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index f252a12965..e82c5952ee 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -297,6 +297,8 @@ public class GregTech_API { sBlockCasings8, sBlockCasings9, sBlockCasings10, sBlockCasings11, sSolenoidCoilCasings; public static Block sBlockLongDistancePipes; public static Block sDroneRender; + public static Block sBlockGlass1; + public static Block sBlockTintedGlass; public static Block sLaserRender; /** * Getting assigned by the Config diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index 74c392ce67..b0e48a46bb 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -678,6 +678,13 @@ public class GT_Values { + "Gold"; public static final String AuthorVolence = "Author: " + EnumChatFormatting.AQUA + "Volence"; + public static final String AuthorNotAPenguin = "Author: " + EnumChatFormatting.WHITE + + EnumChatFormatting.BOLD + + "Not" + + EnumChatFormatting.AQUA + + EnumChatFormatting.BOLD + + "APenguin"; + // 7.5F comes from GT_Tool_Turbine_Large#getBaseDamage() given huge turbines are the most efficient now. public static double getMaxPlasmaTurbineEfficiencyFromMaterial(Materials material) { return (5F + (7.5F + material.mToolQuality)) / 10.0; diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index d1c30a0935..1f5d223a6b 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1152,7 +1152,16 @@ public enum ItemList implements IItemContainer { Machine_Multi_ImplosionCompressor, Machine_Multi_VacuumFreezer, Machine_Multi_Furnace, - + Machine_Multi_PurificationPlant, + Machine_Multi_PurificationUnitClarifier, + Machine_Multi_PurificationUnitFlocculator, + Machine_Multi_PurificationUnitPhAdjustment, + Machine_Multi_PurificationUnitOzonation, + Machine_Multi_PurificationUnitPlasmaHeater, + Machine_Multi_PurificationUnitUVTreatment, + Machine_Multi_PurificationUnitDegasifier, + Machine_Multi_PurificationUnitParticleExtractor, + Hatch_DegasifierControl, Machine_LV_AlloySmelter, Machine_MV_AlloySmelter, Machine_HV_AlloySmelter, @@ -2031,7 +2040,41 @@ public enum ItemList implements IItemContainer { TierdDrone1, TierdDrone2, Hatch_DroneDownLink, - Casing_Shielded_Accelerator; + Hatch_pHSensor, + Hatch_LensHousing, + Hatch_LensIndicator, + ActivatedCarbonFilterMesh, + BlockIndustrialStrengthConcrete, + GlassPHResistant, + GlassTintedIndustrialWhite, + GlassTintedIndustrialLightGray, + GlassTintedIndustrialGray, + GlassTintedIndustrialBlack, + BlockIndustrialWaterPlantCasing, + BlockSterileWaterPlantCasing, + BlockFlocculationCasing, + BlockNaquadahReinforcedWaterPlantCasing, + BlockExtremeCorrosionResistantCasing, + BlockHighPressureResistantCasing, + BlockOzoneCasing, + BlockPlasmaHeatingCasing, + BlockNaquadriaReinforcedWaterPlantCasing, + GlassUVResistant, + BlockUltraVioletLaserEmitter, + Quark_Catalyst_Housing, + Quark_Creation_Catalyst_Up, + Quark_Creation_Catalyst_Down, + Quark_Creation_Catalyst_Strange, + Quark_Creation_Catalyst_Charm, + Quark_Creation_Catalyst_Bottom, + Quark_Creation_Catalyst_Top, + Quark_Creation_Catalyst_Unaligned, + Casing_Shielded_Accelerator, + GlassOmniPurposeInfinityFused, + GlassQuarkContainment, + BlockQuarkPipe, + BlockQuarkReleaseChamber, + BlockQuarkContainmentCasing; public static final ItemList[] DYE_ONLY_ITEMS = { Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15 }, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index f8f6f4636e..2435e1aad7 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -150,14 +150,15 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Ytterbium = new Materials( 77, TextureSet.SET_SHINY , 1.0F, 0, 2, 1|2 |8 |32 , 44, 199, 80, 0, "Ytterbium" , "Ytterbium" , 0, 0, 1097, 1097, true, false, 4, 1, 1, Dyes._NULL , Element.Yb , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))); public static Materials Yttrium = new Materials( 45, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 220, 250, 220, 0, "Yttrium" , "Yttrium" , 0, 0, 1799, 1799, true, false, 4, 1, 1, Dyes._NULL , Element.Y , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))); public static Materials Zinc = new Materials( 36, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1|2 |8 |32 , 250, 240, 240, 0, "Zinc" , "Zinc" , 0, 0, 692, 0, false, false, 2, 1, 1, Dyes.dyeWhite , Element.Zn , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.SANO, 1))); - public static Materials Grade1PurifiedWater = new Materials( 554, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 255, 0, "Grade1PurifiedWater" , "Grade 1 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); - public static Materials Grade2PurifiedWater = new Materials( 555, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 250, 0, "Grade2PurifiedWater" , "Grade 2 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); - public static Materials Grade3PurifiedWater = new Materials( 556, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 245, 0, "Grade3PurifiedWater" , "Grade 3 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); - public static Materials Grade4PurifiedWater = new Materials( 557, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 240, 0, "Grade4PurifiedWater" , "Grade 4 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); - public static Materials Grade5PurifiedWater = new Materials( 558, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 235, 0, "Grade5PurifiedWater" , "Grade 5 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); - public static Materials Grade6PurifiedWater = new Materials( 559, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 230, 0, "Grade6PurifiedWater" , "Grade 6 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); - public static Materials Grade7PurifiedWater = new Materials( 560, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 225, 0, "Grade7PurifiedWater" , "Grade 7 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); - public static Materials Grade8PurifiedWater = new Materials( 561, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 220, 0, "Grade8PurifiedWater" , "Grade 8 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials Grade1PurifiedWater = new Materials( 554, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 34, 35, 52, 0, "Grade1PurifiedWater" , "Grade 1 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials Grade2PurifiedWater = new Materials( 555, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 42, 41, 77, 0, "Grade2PurifiedWater" , "Grade 2 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials Grade3PurifiedWater = new Materials( 556, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 49, 47, 103, 0, "Grade3PurifiedWater" , "Grade 3 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials Grade4PurifiedWater = new Materials( 557, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 54, 53, 132, 0, "Grade4PurifiedWater" , "Grade 4 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials Grade5PurifiedWater = new Materials( 558, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 58, 58, 161, 0, "Grade5PurifiedWater" , "Grade 5 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials Grade6PurifiedWater = new Materials( 559, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 61, 64, 191, 0, "Grade6PurifiedWater" , "Grade 6 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials Grade7PurifiedWater = new Materials( 560, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 63, 70, 221, 0, "Grade7PurifiedWater" , "Grade 7 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials Grade8PurifiedWater = new Materials( 561, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 63, 76, 253, 0, "Grade8PurifiedWater" , "Grade 8 Purified Water" , 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); + public static Materials FlocculationWasteLiquid = new Materials(562, TextureSet.SET_FLUID, 1.0f, 0, 2, 16, 61, 58, 82, 0, "FlocculationWasteLiquid", "Flocculation Waste Liquid", 0, 0, 273, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setHasCorrespondingFluid(true); //GT++ materials @@ -946,6 +947,55 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials TengamAttuned = new MaterialBuilder(112, TextureSet.SET_MAGNETIC, "Attuned Tengam") .addDustItems().addGearItems().addMetalItems().addToolHeadItems().setAspects(Arrays.asList(new TC_AspectStack(TC_Aspects.MAGNETO, 4), new TC_AspectStack(TC_Aspects.ELECTRUM, 1))).setColor(Dyes.dyeLime).setName("TengamAttuned") .setRGB(213, 255, 128).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UV); public static Materials TengamRaw = new MaterialBuilder(110, TextureSet.SET_ROUGH, "Raw Tengam") .addOreItems() .setAspects(Arrays.asList(new TC_AspectStack(TC_Aspects.MAGNETO, 1), new TC_AspectStack(TC_Aspects.ELECTRUM, 4))).setColor(Dyes.dyeLime).setName("TengamRaw") .setRGB(160, 191, 96).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UV); + // Activated Carbon Line + public static Materials ActivatedCarbon = new MaterialBuilder(563, TextureSet.SET_DULL, "Activated Carbon") + .addDustItems() + .setRGB(20, 20, 20) + .setName("ActivatedCarbon") + .setOreValue(0) + .setMaterialList(new MaterialStack(Carbon, 1)) + .constructMaterial() + .disableAutoGeneratedRecycleRecipes(); + public static Materials PreActivatedCarbon = new MaterialBuilder(564, TextureSet.SET_DULL, "Pre-Activated Carbon") + .addDustItems() + .setRGB(15, 51, 65) + .setName("PreActivatedCarbon") + .setOreValue(0) + .setMaterialList(new MaterialStack(Carbon, 1), new MaterialStack(PhosphoricAcid, 1)) + .constructMaterial() + .disableAutoGeneratedRecycleRecipes(); + public static Materials DirtyActivatedCarbon = new MaterialBuilder(565, TextureSet.SET_DULL, "Dirty Activated Carbon") + .addDustItems() + .setRGB(110, 110, 110) + .setName("carbonactivateddirty") // don't change this to the more sensible name or a centrifuge recipe appears + .setOreValue(0) + .setMaterialList(new MaterialStack(Carbon, 1), new MaterialStack(PhosphoricAcid, 1)) + .constructMaterial() + .disableAutoGeneratedRecycleRecipes(); + + // Advanced glue uses id 567?? ok + public static Materials PolyAluminiumChloride = new MaterialBuilder(566, TextureSet.SET_FLUID, "Polyaluminium Chloride") + .addFluid() + .addCell() + .setRGB(252, 236, 5) + .setName("PolyaluminiumChloride") + .constructMaterial(); + + public static Materials Ozone = new MaterialBuilder(568, TextureSet.SET_FLUID, "Ozone") + .addGas() + .addCell() + .setRGB(190, 244, 250) + .setName("Ozone") + .setMaterialList(new MaterialStack(Oxygen, 3)) + .constructMaterial(); + + public static Materials StableBaryonicMatter = new MaterialBuilder(569, TextureSet.SET_FLUID, "Stabilised Baryonic Matter") + .addFluid() + .addCell() + .setRGB(20, 10, 20) + .setName("StableBaryonicMatter") + .constructMaterial(); + // spotless:on static { @@ -1949,11 +1999,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Grade6PurifiedWater.mChemicalFormula = "H\u2082O"; Grade7PurifiedWater.mChemicalFormula = "H\u2082O"; Grade8PurifiedWater.mChemicalFormula = "H\u2082O"; + FlocculationWasteLiquid.mChemicalFormula = "Al\u2082(OH)\u2083??Cl\u2083"; TengamRaw.mChemicalFormula = ""; TengamPurified.mChemicalFormula = "M"; TengamAttuned.mChemicalFormula = "M"; MaterialsUEVplus.ExcitedDTSC.mChemicalFormula = "[-Stellar-Stellar-]"; MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.mChemicalFormula = "Stellar"; + PolyAluminiumChloride.mChemicalFormula = "Al\u2082(OH)\u2083Cl\u2083"; } private static void initSubTags() { diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index b34c5d79f0..78bc31ec57 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -684,6 +684,19 @@ public enum MetaTileEntityIDs { INDUSTRIAL_APIARY(9399), Drone_Centre(9400), DroneDownLink(9401), + PURIFICATION_PLANT_CONTROLLER(9402), + PURIFICATION_UNIT_CLARIFIER(9403), + PURIFICATION_UNIT_OZONATION(9404), + PURIFICATION_UNIT_FLOCCULATOR(9405), + PURIFICATION_UNIT_PH_ADJUSTMENT(9406), + HATCH_PH_SENSOR(9407), + PURIFICATION_UNIT_PLASMA_HEATER(9408), + PURIFICATION_UNIT_UV_TREATMENT(9409), + HATCH_LENS_HOUSING(9410), + HATCH_LENS_INDICATOR(9411), + PURIFICATION_UNIT_DEGASIFIER(9412), + HATCH_DEGASIFIER_CONTROL(9413), + PURIFICATION_UNIT_PARTICLE_EXTRACTOR(9414), sofc1(13101), sofc2(13102), tfft(13104), diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java index 54a2162541..712c1b5016 100644 --- a/src/main/java/gregtech/api/enums/SoundResource.java +++ b/src/main/java/gregtech/api/enums/SoundResource.java @@ -63,6 +63,12 @@ public enum SoundResource { GT_MACHINES_WATER_PUMP_LOOP(234, GregTech.ID, "machines.WaterPumpLoop"), GT_MACHINES_STEAM_CENTRIFUGE_LOOP(235, GregTech.ID, "machines.Ste |