Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some references to GT++ items #1196

Merged
merged 6 commits into from
Feb 14, 2025
Merged

Fix some references to GT++ items #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a42dc7e
Fix some references to GT++ items
serenibyss Feb 12, 2025
b601565
fish trap as well
serenibyss Feb 12, 2025
0f12cdd
Merge branch 'master' into fix-gtpp-references
Dream-Master Feb 13, 2025
5811650
Merge branch 'master' into fix-gtpp-references
Dream-Master Feb 13, 2025
466c831
Merge branch 'master' into fix-gtpp-references
Dream-Master Feb 14, 2025
92b653e
Merge branch 'master' into fix-gtpp-references
Dream-Master Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
import static gtPlusPlus.core.block.ModBlocks.blockFishTrap;
import static gtPlusPlus.core.material.MaterialsAlloy.AQUATIC_STEEL;
import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_C276;
import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_W;
Expand Down Expand Up @@ -1602,7 +1601,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.WroughtIron, 1L),
CustomItemList.SteelBars.get(6L),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(new ItemStack(blockFishTrap, 1, 0)).duration(10 * SECONDS).eut(64).addTo(assemblerRecipes);
.itemOutputs(GregtechItemList.FishTrap.get(1)).duration(10 * SECONDS).eut(64).addTo(assemblerRecipes);

if (ExtraBees.isModLoaded()) {
ItemStack alveary = GTModHandler.getModItem(Forestry.ID, "alveary", 1L, 0);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import gregtech.api.enums.TierEU;
import gregtech.api.recipe.metadata.CompressionTierKey;
import gregtech.api.util.GTOreDictUnificator;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtnhlanth.common.register.WerkstoffMaterialPool;

public class CompressorRecipes implements Runnable {
Expand Down Expand Up @@ -298,12 +298,12 @@ private void makeExtraUtilitiesRecipes() {
private void makeGTPlusPlusRecipes() {
// Compressed Glowstone
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glowstone, 9))
.itemOutputs(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 6)).duration(15 * SECONDS).eut(2)
.itemOutputs(GregtechItemList.CompressedGlowstone.get(1)).duration(15 * SECONDS).eut(2)
.addTo(compressorRecipes);

// Double Compressed Glowstone
GTValues.RA.stdBuilder().itemInputs(new ItemStack(ModBlocks.blockCompressedObsidian, 9, 6))
.itemOutputs(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 7)).duration(15 * SECONDS).eut(2)
GTValues.RA.stdBuilder().itemInputs(GregtechItemList.CompressedGlowstone.get(9))
.itemOutputs(GregtechItemList.DoubleCompressedGlowstone.get(1)).duration(15 * SECONDS).eut(2)
.addTo(compressorRecipes);
}

Expand Down
16 changes: 7 additions & 9 deletions src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.ItemStack;

import com.dreammaster.gthandler.CustomItemList;

import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
import gregtech.api.enums.ItemList;
import gtPlusPlus.xmod.ic2.item.IC2Items;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;

public class ScriptCompactKineticGenerators implements IScriptLoader {

Expand Down Expand Up @@ -43,15 +41,15 @@ public void loadRecipes() {
"plateAlloyIridium");
addShapedRecipe(
getModItem(CompactKineticGenerators.ID, "IridiumRotor", 1, 0, missing),
new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0),
GregtechItemList.IridiumShaft.get(1),
getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing),
"craftingToolHardHammer",
getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing),
"ringChrome",
getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing),
"craftingToolWrench",
getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing),
new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0));
GregtechItemList.IridiumShaft.get(1));

ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
getModItem(CompactKineticGenerators.ID, "BlockCkg", 1, 0, missing),
Expand Down Expand Up @@ -283,7 +281,7 @@ public void loadRecipes() {
'a',
"plateTripleTungstenSteel",
'b',
new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0),
GregtechItemList.TungstenSteelShaft.get(1),
'c',
"rotorTungstenSteel",
'd',
Expand Down Expand Up @@ -314,7 +312,7 @@ public void loadRecipes() {
'a',
"plateTripleIridium",
'b',
new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0),
GregtechItemList.TungstenSteelShaft.get(1),
'c',
"rotorIridium",
'd',
Expand Down Expand Up @@ -345,7 +343,7 @@ public void loadRecipes() {
'a',
"plateTripleNaquadah",
'b',
new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0),
GregtechItemList.IridiumShaft.get(1),
'c',
"rotorOsmium",
'd',
Expand Down Expand Up @@ -376,7 +374,7 @@ public void loadRecipes() {
'a',
"plateTripleNeutronium",
'b',
new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0),
GregtechItemList.IridiumShaft.get(1),
'c',
"rotorNeutronium",
'd',
Expand Down
11 changes: 4 additions & 7 deletions src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
Expand Down Expand Up @@ -1016,7 +1015,7 @@ public void loadRecipes() {
getModItem(ExtraUtilities.ID, "extractor_base", 1, 12, missing)));
EnderConstructorRecipesHandler.registerRecipe(
new ShapedOreRecipe(
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 5),
GregtechItemList.InvertedObsidian.get(1),
"abc",
"def",
"ghi",
Expand Down Expand Up @@ -1414,12 +1413,10 @@ public void loadRecipes() {
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Tritanium, 1L),
NHItemList.EngravedGoldChip.getIS(1),
getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing),
new ItemStack(ModItems.itemMagicFeather),
getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), GregtechItemList.MagicFeather.get(1),
getModItem(Minecraft.ID, "nether_star", 1, 0, missing),
getModItem(Avaritia.ID, "big_pearl", 1, 0, missing),
getModItem(Minecraft.ID, "nether_star", 1, 0, missing),
new ItemStack(ModItems.itemMagicFeather),
getModItem(Minecraft.ID, "nether_star", 1, 0, missing), GregtechItemList.MagicFeather.get(1),
getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing),
getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing),
NHItemList.EngravedGoldChip.getIS(1),
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.chemistry.GenericChem;
import gtPlusPlus.core.material.MaterialsAlloy;
import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;

public class ScriptGregtechPlusPlus implements IScriptLoader {

Expand Down Expand Up @@ -98,7 +98,7 @@ public void loadRecipes() {

// Fish Trap
addShapedRecipe(
new ItemStack(ModBlocks.blockFishTrap),
GregtechItemList.FishTrap.get(1),
NHItemList.SteelBars.getIS(),
NHItemList.SteelBars.getIS(),
NHItemList.SteelBars.getIS(),
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
import gregtech.api.objects.ItemData;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gtPlusPlus.xmod.ic2.item.IC2Items;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;

public class ScriptIndustrialCraft implements IScriptLoader {

Expand Down Expand Up @@ -313,15 +313,15 @@ public void loadRecipes() {
getModItem(IndustrialCraft2.ID, "itemPartCarbonPlate", 1, 0, missing));
addShapedRecipe(
getModItem(IndustrialCraft2.ID, "itemwcarbonrotor", 1, 1, missing),
new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0),
GregtechItemList.TungstenSteelShaft.get(1),
getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing),
"craftingToolHardHammer",
getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing),
"ringIridium",
getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing),
"craftingToolWrench",
getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing),
new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0));
GregtechItemList.TungstenSteelShaft.get(1));
addShapedRecipe(
getModItem(IndustrialCraft2.ID, "blockKineticGenerator", 1, 5, missing),
ItemList.Electric_Motor_MV.get(1L),
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
Expand Down Expand Up @@ -664,7 +664,7 @@ public void loadRecipes() {
5,
new AspectList().add(Aspect.getAspect("iter"), 32).add(Aspect.getAspect("vinculum"), 32)
.add(Aspect.getAspect("desidia"), 16).add(Aspect.getAspect("sensus"), 16),
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1),
GregtechItemList.DoubleCompressedObsidian.get(1),
new ItemStack[] { getModItem(IndustrialCraft2.ID, "itemDensePlates", 1, 8, missing),
getModItem(CarpentersBlocks.ID, "itemCarpentersBed", 1, 0, missing),
GTOreDictUnificator.get(OrePrefixes.gemFlawless, Materials.Diamond, 1L),
Expand Down Expand Up @@ -1137,11 +1137,11 @@ public void loadRecipes() {
getModItem(Thaumcraft.ID, "blockMetalDevice", 1, 12, missing),
new ItemStack[] { getModItem(Thaumcraft.ID, "FocusPrimal", 1, 0, missing),
getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing),
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1),
GregtechItemList.DoubleCompressedObsidian.get(1),
getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing),
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1),
GregtechItemList.DoubleCompressedObsidian.get(1),
getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing),
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1),
GregtechItemList.DoubleCompressedObsidian.get(1),
getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), });
ThaumcraftApi.addInfusionCraftingRecipe(
"TB.NodeFoci.Efficiency",
Expand Down
Loading