Skip to content

Commit

Permalink
remove gregtech gmi (1/2)
Browse files Browse the repository at this point in the history
  • Loading branch information
@boubou19
boubou19 committed Aug 30, 2024
1 parent 532bdaf commit b932d85
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 43 deletions.
6 changes: 3 additions & 3 deletions src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ public void run() {

// Magnetic Flux Exhibitor
GT_ModHandler.addCraftingRecipe(
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 358),
ItemList.Machine_Multi_IndustrialElectromagneticSeparator.get(1),
bits,
new Object[] { "CBC", "FMF", "CBC", 'M', ItemList.Machine_IV_ElectromagneticSeparator, 'B',
OrePrefixes.circuit.get(Materials.IV), 'C', OrePrefixes.plate.get(Materials.TungstenSteel), 'F',
Expand All @@ -666,14 +666,14 @@ public void run() {

// Electromagnet Housing
GT_ModHandler.addCraftingRecipe(
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 359),
ItemList.Hatch_Electromagnet.get(1),
bits,
new Object[] { "CFC", "FMF", "CFC", 'M', ItemList.Hatch_Input_Bus_IV, 'C',
OrePrefixes.plate.get(Materials.Polystyrene), 'F', CustomItemList.TungstenSteelBars });

// TurboCan Pro
GT_ModHandler.addCraftingRecipe(
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 360),
ItemList.Machine_Multi_Canner.get(1),
bits,
new Object[] { "CFC", "AMB", "CFC", 'A', ItemList.Machine_HV_Canner, 'B',
ItemList.Machine_HV_FluidCanner, 'F', OrePrefixes.circuit.get(Materials.HV), 'C',
Expand Down
19 changes: 10 additions & 9 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;

import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;

Expand Down Expand Up @@ -1054,7 +1055,7 @@ public void recipes() {
OrePrefixes.cableGt16.get(Materials.Lead), 'S', OrePrefixes.spring.get(Materials.Tin), 'X',
OrePrefixes.cableGt08.get(Materials.Tin), 'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 877) });
GregtechItemList.Transformer_HA_LV_ULV.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_MV_LV.get(1L),
Expand All @@ -1063,7 +1064,7 @@ public void recipes() {
OrePrefixes.cableGt16.get(Materials.Tin), 'S', OrePrefixes.spring.get(Materials.AnyCopper),
'X', OrePrefixes.cableGt08.get(Materials.AnyCopper), 'O',
OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 878) });
GregtechItemList.Transformer_HA_MV_LV.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_HV_MV.get(1L),
Expand All @@ -1072,7 +1073,7 @@ public void recipes() {
OrePrefixes.cableGt16.get(Materials.AnyCopper), 'S', OrePrefixes.spring.get(Materials.Gold),
'X', OrePrefixes.cableGt08.get(Materials.Gold), 'O',
OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 879) });
GregtechItemList.Transformer_HA_HV_MV.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_EV_HV.get(1L),
Expand All @@ -1081,7 +1082,7 @@ public void recipes() {
OrePrefixes.cableGt16.get(Materials.Gold), 'S', OrePrefixes.spring.get(Materials.Aluminium),
'X', OrePrefixes.cableGt08.get(Materials.Aluminium), 'O',
OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 880) });
GregtechItemList.Transformer_HA_EV_HV.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_IV_EV.get(1L),
Expand All @@ -1091,7 +1092,7 @@ public void recipes() {
OrePrefixes.spring.get(Materials.Tungsten), 'X',
OrePrefixes.cableGt08.get(Materials.Tungsten), 'O',
OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 881) });
GregtechItemList.Transformer_HA_IV_EV.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_LuV_IV.get(1L),
Expand All @@ -1101,7 +1102,7 @@ public void recipes() {
OrePrefixes.spring.get(Materials.VanadiumGallium), 'X',
OrePrefixes.cableGt08.get(Materials.VanadiumGallium), 'O',
OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 882) });
GregtechItemList.Transformer_HA_LuV_IV.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_ZPM_LuV.get(1L),
Expand All @@ -1111,7 +1112,7 @@ public void recipes() {
OrePrefixes.spring.get(Materials.Naquadah), 'X',
OrePrefixes.cableGt08.get(Materials.Naquadah), 'O',
OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 883) });
GregtechItemList.Transformer_HA_ZPM_LuV.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_UV_ZPM.get(1L),
Expand All @@ -1121,7 +1122,7 @@ public void recipes() {
OrePrefixes.spring.get(Materials.NaquadahAlloy), 'X',
OrePrefixes.cableGt08.get(Materials.NaquadahAlloy), 'O',
OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 884) });
GregtechItemList.Transformer_HA_UV_ZPM.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_UHV_UV.get(1L),
Expand All @@ -1131,7 +1132,7 @@ public void recipes() {
OrePrefixes.spring.get(Materials.Neutronium), 'X',
OrePrefixes.wireGt08.get(Materials.Bedrockium), 'O',
OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV, 'T',
GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 885) });
GregtechItemList.Transformer_HA_MAX_UV.get(1) });

GT_ModHandler.addCraftingRecipe(
ItemList.WetTransformer_UEV_UHV.get(1L),
Expand Down
33 changes: 20 additions & 13 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
import static com.github.technus.tectech.thing.CustomItemList.DATApipe;
import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_DataBank;
import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Switch;
import static com.github.technus.tectech.thing.CustomItemList.dataInAss_Hatch;
import static com.github.technus.tectech.thing.CustomItemList.dataInAss_Wireless_Hatch;
import static com.github.technus.tectech.thing.CustomItemList.dataIn_Hatch;
import static com.github.technus.tectech.thing.CustomItemList.dataIn_Wireless_Hatch;
import static com.github.technus.tectech.thing.CustomItemList.dataOutAss_Hatch;
import static com.github.technus.tectech.thing.CustomItemList.dataOutAss_Wireless_Hatch;
import static com.github.technus.tectech.thing.CustomItemList.dataOut_Hatch;
import static com.github.technus.tectech.thing.CustomItemList.dataOut_Wireless_Hatch;
import static gregtech.api.enums.Mods.AE2FluidCraft;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
import static gregtech.api.enums.Mods.BartWorks;
Expand Down Expand Up @@ -201,15 +209,14 @@ public void run() {

// Cloud Computation Client Hatch
TT_recipeAdder.addResearchableAssemblylineRecipe(
// Optical Slave Connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15440),
dataIn_Hatch.get(1),
512000,
2000,
100_000_000,
2,
new ItemStack[] {
// Regular slave connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15440),
dataIn_Hatch.get(1),
// Network Switch With QoS
Machine_Multi_Switch.get(1),
// Data pipe
Expand All @@ -226,21 +233,21 @@ public void run() {
ItemList.EnergisedTesseract.get(1) },
new FluidStack[] { new FluidStack(solderUEV, 1296), MaterialsUEVplus.ExcitedDTEC.getFluid(500L) },
// Cloud Computation Client Hatch
getModItem(GregTech.ID, "gt.blockmachines", 1, 15445),
dataIn_Wireless_Hatch.get(1),
30 * SECONDS,
(int) TierEU.RECIPE_UMV);

// Cloud computation server hatch
TT_recipeAdder.addResearchableAssemblylineRecipe(
// Optical Master Connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15441),
dataOut_Hatch.get(1),
512000,
2000,
100_000_000,
2,
new ItemStack[] {
// Regular master connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15441),
dataOut_Hatch.get(1),
// Network Switch With QoS
Machine_Multi_Switch.get(1),
// Data pipe
Expand All @@ -257,21 +264,21 @@ public void run() {
ItemList.EnergisedTesseract.get(1) },
new FluidStack[] { new FluidStack(solderUEV, 1296), MaterialsUEVplus.ExcitedDTEC.getFluid(500L) },
// Cloud Computation Server Hatch
getModItem(GregTech.ID, "gt.blockmachines", 1, 15444),
dataOut_Wireless_Hatch.get(1),
30 * SECONDS,
(int) TierEU.RECIPE_UMV);

// Wireless assembly line slave connector
TT_recipeAdder.addResearchableAssemblylineRecipe(
// Assembly line slave connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15442),
dataInAss_Hatch.get(1),
512000,
2000,
100_000_000,
2,
new ItemStack[] {
// Assembly line slave connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15442),
dataInAss_Hatch.get(1),
// Data bank
Machine_Multi_DataBank.get(1),
// Data pipe
Expand All @@ -288,21 +295,21 @@ public void run() {
ItemList.EnergisedTesseract.get(1) },
new FluidStack[] { new FluidStack(solderUEV, 1296), MaterialsUEVplus.ExcitedDTEC.getFluid(500L) },
// Wireless assembly line slave connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15446),
dataInAss_Wireless_Hatch.get(1),
30 * SECONDS,
(int) TierEU.RECIPE_UMV);

// Wireless data bank master connector
TT_recipeAdder.addResearchableAssemblylineRecipe(
// Data bank master connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15443),
dataOutAss_Hatch.get(1),
512000,
2000,
100_000_000,
2,
new ItemStack[] {
// Data bank master connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15443),
dataOutAss_Hatch.get(1),
// Data bank
Machine_Multi_DataBank.get(1),
// Data pipe
Expand All @@ -319,7 +326,7 @@ public void run() {
ItemList.EnergisedTesseract.get(1) },
new FluidStack[] { new FluidStack(solderUEV, 1296), MaterialsUEVplus.ExcitedDTEC.getFluid(500L) },
// Wireless data bank master connector
getModItem(GregTech.ID, "gt.blockmachines", 1, 15447),
dataOutAss_Wireless_Hatch.get(1),
30 * SECONDS,
(int) TierEU.RECIPE_UMV);

Expand Down
24 changes: 12 additions & 12 deletions src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,37 +195,37 @@ public void loadRecipes() {
getModItem(ExtraUtilities.ID, "enderQuarryUpgrade", 1, 0, missing));
addShapedRecipe(
getModItem(ExtraUtilities.ID, "enderQuarryUpgrade", 1, 6, missing),
getModItem(GregTech.ID, "gt.blockmachines", 1, 11102, missing),
ItemList.AcceleratorHV.get(1),
"gearTitanium",
getModItem(GregTech.ID, "gt.blockmachines", 1, 11102, missing),
ItemList.AcceleratorHV.get(1),
getModItem(ExtraUtilities.ID, "nodeUpgrade", 1, 0, missing),
"gearDiamond",
getModItem(ExtraUtilities.ID, "nodeUpgrade", 1, 0, missing),
getModItem(GregTech.ID, "gt.blockmachines", 1, 11102, missing),
ItemList.AcceleratorHV.get(1),
"gearTitanium",
getModItem(GregTech.ID, "gt.blockmachines", 1, 11102, missing));
ItemList.AcceleratorHV.get(1));
addShapedRecipe(
getModItem(ExtraUtilities.ID, "enderQuarryUpgrade", 1, 7, missing),
getModItem(GregTech.ID, "gt.blockmachines", 1, 11103, missing),
ItemList.AcceleratorEV.get(1),
"gearTungstenSteel",
getModItem(GregTech.ID, "gt.blockmachines", 1, 11103, missing),
ItemList.AcceleratorEV.get(1),
"gearTungstenSteel",
getModItem(ExtraUtilities.ID, "enderQuarryUpgrade", 1, 6, missing),
"gearTungstenSteel",
getModItem(GregTech.ID, "gt.blockmachines", 1, 11103, missing),
ItemList.AcceleratorEV.get(1),
"gearTungstenSteel",
getModItem(GregTech.ID, "gt.blockmachines", 1, 11103, missing));
ItemList.AcceleratorEV.get(1));
addShapedRecipe(
getModItem(ExtraUtilities.ID, "enderQuarryUpgrade", 1, 8, missing),
getModItem(GregTech.ID, "gt.blockmachines", 1, 11104, missing),
ItemList.AcceleratorIV.get(1),
"gearChrome",
getModItem(GregTech.ID, "gt.blockmachines", 1, 11104, missing),
ItemList.AcceleratorIV.get(1),
"gearChrome",
getModItem(ExtraUtilities.ID, "enderQuarryUpgrade", 1, 7, missing),
"gearChrome",
getModItem(GregTech.ID, "gt.blockmachines", 1, 11104, missing),
ItemList.AcceleratorIV.get(1),
"gearChrome",
getModItem(GregTech.ID, "gt.blockmachines", 1, 11104, missing));
ItemList.AcceleratorIV.get(1));
addShapedRecipe(
getModItem(ExtraUtilities.ID, "enderQuarryUpgrade", 1, 9, missing),
getModItem(ExtraUtilities.ID, "enderQuarryUpgrade", 1, 0, missing),
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.util.Arrays;
import java.util.List;

import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraftforge.fluids.FluidRegistry;

import com.dreammaster.gthandler.CustomItemList;
Expand Down Expand Up @@ -54,7 +55,7 @@ public List<String> getDependencies() {
@Override
public void loadRecipes() {
addShapedRecipe(
getModItem(GregTech.ID, "gt.blockmachines", 1, 875, missing),
GregtechItemList.GT4_Thermal_Boiler.get(1),
getModItem(RemoteIO.ID, "tile.machine", 1, 1, missing),
ItemList.Machine_HV_Centrifuge.get(1L),
getModItem(RemoteIO.ID, "tile.machine", 1, 1, missing),
Expand Down Expand Up @@ -99,7 +100,7 @@ public void loadRecipes() {
getModItem(GTPlusPlus.ID, "itemPlateTumbaga", 1, 0, missing),
getModItem(GTPlusPlus.ID, "itemRodTumbaga", 1, 0, missing));
addShapedRecipe(
getModItem(GregTech.ID, "gt.blockmachines", 1, 798, missing),
GregtechItemList.Industrial_WireFactory.get(1),
"plateBlueSteel",
ItemList.Casing_IV.get(1L),
"plateBlueSteel",
Expand All @@ -110,7 +111,7 @@ public void loadRecipes() {
ItemList.Casing_IV.get(1L),
"plateBlueSteel");
addShapedRecipe(
getModItem(GregTech.ID, "gt.blockmachines", 1, 753, missing),
GregtechItemList.Boiler_Advanced_LV.get(1),
ItemList.Electric_Pump_LV.get(1L),
"circuitBasic",
ItemList.Electric_Pump_LV.get(1L),
Expand All @@ -132,7 +133,7 @@ public void loadRecipes() {
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1L),
"plateDoubleLead");
addShapedRecipe(
getModItem(GregTech.ID, "gt.blockmachines", 1, 754, missing),
GregtechItemList.Boiler_Advanced_MV.get(1),
ItemList.Electric_Pump_MV.get(1L),
"circuitGood",
ItemList.Electric_Pump_MV.get(1L),
Expand All @@ -154,7 +155,7 @@ public void loadRecipes() {
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1L),
"plateDoubleStainlessSteel");
addShapedRecipe(
getModItem(GregTech.ID, "gt.blockmachines", 1, 755, missing),
GregtechItemList.Boiler_Advanced_HV.get(1),
ItemList.Electric_Pump_HV.get(1L),
"circuitAdvanced",
ItemList.Electric_Pump_HV.get(1L),
Expand All @@ -176,7 +177,7 @@ public void loadRecipes() {
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1L),
"plateDoubleTitanium");
addShapedRecipe(
getModItem(GregTech.ID, "gt.blockmachines", 1, 820, missing),
GregtechItemList.GT_FluidTank_HV.get(1),
"circuitPrimitive",
"plateAluminium",
"circuitPrimitive",
Expand Down

0 comments on commit b932d85

Please sign in to comment.