aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-21 20:29:38 +0200
committerGitHub <noreply@github.com>2023-04-21 20:29:38 +0200
commitde864236f83dc31c53ca77a6939357a0959bca75 (patch)
treeef739fd9426e7c2525b1560386faaa5bb893e30d /src/main/java/gregtech
parent285a75535d07f2037967b1208a5840fb81719514 (diff)
downloadGT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.tar.gz
GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.tar.bz2
GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.zip
Recipes ra2 (#1872)
* Recipes RA2 fixes * Use \uXXXX for non-ASCII characters * Misc cleanup (#1888) * migrate away from addThermalCentrifugeRecipe * split recipes of GT_Block_Stones_Abstract * migrate away from addForgeHammerRecipe * migrate away from addChemicalBathRecipe * remove "DisableOldChemicalRecipes" and its usage, as it's disabled by default in NH and it increases recipe complexity for nothing * Remove underground biomes ore classes, as it's not present in NH * migrate away from addFluidCannerRecipe * migrate away from addFluidExtractionRecipe * migrate away from addChemicalRecipe * migrate away from addMultiblockChemicalRecipe * deprecate addChemicalRecipeForBasicMachineOnly * migrate away from addCentrifugeRecipe * spotlessApply * fixing wrong merge conflict solving * Add Tengam materials (#1891) * Add Tengam materials * Change new recipes to consume 15/16 Amp * Remove now redundant `break` statements * fix comb chances? * fix centrifuge code not working --------- Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/GT_Mod.java1
-rw-r--r--src/main/java/gregtech/api/enums/MaterialBuilder.java1
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java40
-rw-r--r--src/main/java/gregtech/api/enums/Tier.java4
-rw-r--r--src/main/java/gregtech/api/enums/TierEU.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java578
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java13
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeBuilder.java11
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeRegistrator.java70
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java3
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java73
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java43
-rw-r--r--src/main/java/gregtech/common/GT_ThaumcraftCompat.java10
-rw-r--r--src/main/java/gregtech/common/bees/GT_AlleleHelper.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Machines.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java72
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java73
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java73
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java94
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings5.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Machines.java1
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Arm.java40
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java6
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java4
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Shutter.java8
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java6
-rw-r--r--src/main/java/gregtech/common/fluid/GT_Fluid.java15
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java3
-rw-r--r--src/main/java/gregtech/common/items/GT_FluidDisplayItem.java10
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java18
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java141
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java395
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java7
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java183
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java44
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java47
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java20
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java7
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java14
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java14
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java60
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java2
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java4
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java4
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java2
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java2
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Plunger.java3
-rw-r--r--src/main/java/gregtech/crossmod/GregtechWailaDataProvider.java1
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java25
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java1
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java93
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java27
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java98
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java863
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java18
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java102
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java18
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java172
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java225
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java122
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java28
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java141
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java575
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java322
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java73
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java42
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java108
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java16
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java24
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java15
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java33
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java19
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java17
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java232
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java398
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_PostLoad.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java505
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java111
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java15
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java47
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java18
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java18
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java253
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java2
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java13
102 files changed, 3951 insertions, 3185 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index cda731540b..7b88920d8a 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -178,6 +178,7 @@ public class GT_Mod implements IGT_Mod {
}
}
+ @SuppressWarnings("deprecation")
public GT_Mod() {
GT_Values.GT = this;
GT_Values.DW = new GT_DummyWorld();
diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java
index 92ae7c07c3..175081e0ce 100644
--- a/src/main/java/gregtech/api/enums/MaterialBuilder.java
+++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java
@@ -35,7 +35,6 @@ public class MaterialBuilder {
private boolean hasCorrespondingFluid = false;
private boolean hasCorrespondingGas = false;
private boolean canBeCracked = false;
- private boolean canBeSteamCracked = false;
private int liquidTemperature = 300;
private int gasTemperature = 300;
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 60bcb7a867..f2fcc9aebd 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -891,6 +891,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials EnrichedHolmium = new Materials(582, TextureSet.SET_METALLIC, 1.0F, 0, 2, 18, 100, 1|2|4|16, 255, 255, "EnrichedHolmium", "Enriched Holmium", -1, -1, 0, 3000, true, false, 200, 1, 1, Dyes.dyePurple);
+ public static Materials TengamPurified = new MaterialBuilder(111, TextureSet.SET_METALLIC, "Purified Tengam").addDustItems().addGearItems().addMetalItems().addToolHeadItems().setAspects(Arrays.asList(new TC_AspectStack(TC_Aspects.MAGNETO, 2), new TC_AspectStack(TC_Aspects.ELECTRUM, 2))).setColor(Dyes.dyeLime).setName("TengamPurified").setRGB(186, 223, 112).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_UEV);
+ 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_UEV);
+ 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_UEV);
+
// spotless:on
static {
@@ -1372,6 +1376,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
Sand.setSmeltingInto(Glass);
Ice.setSmeltingInto(Water);
Snow.setSmeltingInto(Water);
+ TengamAttuned.setSmeltingInto(TengamPurified)
+ .setMaceratingInto(TengamPurified)
+ .setArcSmeltingInto(TengamPurified);
}
private static v