diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-09-25 06:48:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-25 12:48:46 +0200 |
| commit | 683e0970aea98b5d59fb0de928d130cd8e44360e (patch) | |
| tree | 40bad7e9bb301f56a4ae0f9b1d08b2175b066668 /src/main/java/gtPlusPlus/core | |
| parent | 00b6c43af283b0a7a33e039718a63826d635576e (diff) | |
| download | GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.gz GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.bz2 GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.zip | |
So, so, so many collisions (#3278)
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/ModItems.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java | 15 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java | 11 |
3 files changed, 11 insertions, 19 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 0929b0b0ce..a7fe8ced30 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -874,17 +874,13 @@ public final class ModItems { // Small Springs MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.MARAGING250); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.NICHROME); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STABALLOY); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.STEEL_BLACK); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SMALLSPRING, MaterialsAlloy.BLACK_TITANIUM); // Fine Wire MaterialUtils .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.STANDALONE.WHITE_METAL); MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().PALLADIUM); - MaterialUtils .generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().ZIRCONIUM); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.LEAGRISIUM); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.BABBIT_ALLOY); diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java index a78d2be2cb..bf587a137f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java @@ -1427,14 +1427,6 @@ public class RecipesGregTech { .eut(TierEU.RECIPE_HV / 2) .addTo(fluidExtractionRecipes); - // Ender Fluid - RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(Items.ender_pearl)) - .fluidOutputs(FluidUtils.getFluidStack("ender", 250)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(fluidExtractionRecipes); - // Blazing Pyrotheum RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) @@ -1575,13 +1567,6 @@ public class RecipesGregTech { private static void macerationRecipes() { - RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)) - .duration(44 * SECONDS) - .eut(4) - .addTo(maceratorRecipes); - if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) { RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1)) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index 23cc3f223e..b66249a3ec 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -980,6 +980,13 @@ public class RecipesMachines { // RTG GTValues.RA.stdBuilder() + .itemInputs( + ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1), + MaterialsAlloy.NITINOL_60.getPlate(8), + MaterialsAlloy.MARAGING350.getGear(4), + ItemList.Field_Generator_EV.get(8), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 32), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4)) .itemOutputs(GregtechItemList.RTG.get(1)) .fluidInputs(MaterialsAlloy.NIOBIUM_CARBIDE.getFluidStack(144 * 16)) .duration(10 * MINUTES) @@ -1779,6 +1786,10 @@ public class RecipesMachines { "plateNiobiumCarbide", RECIPE_IndustrialMatterFabFrame); GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.NIOBIUM_CARBIDE.getPlate(4), + MaterialsAlloy.INCONEL_792.getRod(4), + MaterialsAlloy.INCONEL_690.getFrameBox(1)) .itemOutputs(RECIPE_IndustrialMatterFabFrame) .duration(2 * SECONDS + 10 * TICKS) .eut(16) |