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

Migrate coremod machines to GT5u #1145

Merged
merged 5 commits into from
Jan 9, 2025
Merged

Migrate coremod machines to GT5u #1145

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d85d885
Remove unneeded MetaTileEntityIDs
serenibyss Jan 9, 2025
d9b4c01
name remover
serenibyss Jan 9, 2025
74a59b2
air filter
serenibyss Jan 9, 2025
20c2893
clean out a couple loose ends
serenibyss Jan 9, 2025
0f2e366
update
serenibyss Jan 9, 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
1 change: 0 additions & 1 deletion src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes;
import static bartworks.util.BWRecipes.computeSieverts;
import static com.dreammaster.gthandler.GT_CoreModSupport.*;
import static gregtech.api.enums.Materials.*;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.Genetics;
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/com/dreammaster/gthandler/CoreMod_PCBFactory_MaterialLoader.java
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/java/com/dreammaster/gthandler/CustomItemList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@

public enum CustomItemList implements IItemContainer {

Machine_Multi_AirFilterT1,
Machine_Multi_AirFilterT2,
Machine_Multi_AirFilterT3,

// CoreModItems
EtchedLowVoltageWiring,
EtchedInsaneVoltageWiring,
Expand Down Expand Up @@ -310,7 +306,6 @@ public enum CustomItemList implements IItemContainer {
MedalWarp,
MaceratedPlantmass,
EngineCore,
nameRemover,
TwilightCrystal,
UnfiredClayBrick,
UnfiredSearedBrick,
Expand Down
22 changes: 0 additions & 22 deletions src/main/java/com/dreammaster/gthandler/GT_CoreModSupport.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ public void run() {
OrePrefixes.stickLong.get(Materials.Steel), 'R', OrePrefixes.rotor.get(Materials.Steel), 'M',
ItemList.Electric_Motor_LV, 'R', OrePrefixes.screw.get(Materials.Steel) });
GTModHandler.addCraftingRecipe(
CustomItemList.Machine_Multi_AirFilterT1.get(1L),
ItemList.Machine_Multi_AirFilterT1.get(1L),
bits,
new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_LV, 'R', OrePrefixes.rotor.get(Materials.Steel),
'P', ItemList.Electric_Pump_LV, 'M', ItemList.Electric_Motor_LV, 'C',
Expand All @@ -628,7 +628,7 @@ public void run() {
OrePrefixes.stickLong.get(Materials.Titanium), 'R', OrePrefixes.rotor.get(Materials.Titanium),
'M', ItemList.Electric_Motor_HV, 'R', OrePrefixes.screw.get(Materials.Titanium) });
GTModHandler.addCraftingRecipe(
CustomItemList.Machine_Multi_AirFilterT2.get(1L),
ItemList.Machine_Multi_AirFilterT2.get(1L),
bits,
new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_HV, 'R',
OrePrefixes.rotor.get(Materials.Titanium), 'P', ItemList.Electric_Pump_HV, 'M',
Expand All @@ -647,7 +647,7 @@ public void run() {
OrePrefixes.rotor.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'R',
OrePrefixes.screw.get(Materials.TungstenSteel) });
GTModHandler.addCraftingRecipe(
CustomItemList.Machine_Multi_AirFilterT3.get(1L),
ItemList.Machine_Multi_AirFilterT3.get(1L),
bits,
new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_IV, 'R',
OrePrefixes.rotor.get(Materials.TungstenSteel), 'P', ItemList.Electric_Pump_IV, 'M',
Expand Down
32 changes: 1 addition & 31 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.dreammaster.gthandler;

import static com.dreammaster.gthandler.enums.MetaTileEntityIDs.*;
import static gregtech.api.enums.GTValues.VP;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.slicerRecipes;
Expand All @@ -10,10 +9,6 @@
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;

import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT1;
import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT2;
import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT3;
import com.dreammaster.gthandler.nameRemover.NameRemover;
import com.dreammaster.item.food.QuantumBread;

import gregtech.api.enums.GTValues;
Expand Down Expand Up @@ -70,8 +65,6 @@ public void run() {
registerPlasmaArcFurnace();
registerCanningMachine();
registerChemicalBath();
registerAirFilter();
registerNameRemover();
registerCircuitAssembler();
registerMachines2();
recipes();
Expand Down Expand Up @@ -939,7 +932,7 @@ public void recipes() {
OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UMV) });

GTModHandler.addCraftingRecipe(
CustomItemList.nameRemover.get(1L),
ItemList.NameRemover.get(1L),
bitsd,
new Object[] { "SsS", "VMV", "SXS", 'M', ItemList.Hull_ULV, 'V',
OrePrefixes.gearGtSmall.get(Materials.AnyBronze), 'S', OrePrefixes.screw.get(Materials.AnyIron),
Expand Down Expand Up @@ -3318,29 +3311,6 @@ private void registerChemicalBath() {
12);
}

private void registerAirFilter() {
CustomItemList.Machine_Multi_AirFilterT1.set(
new GT_MetaTileEntity_AirFilterT1(
AIR_FILTER_CONTROLLER_T1.ID,
"multimachine.airfilter.01",
"Electric Air Filter T1").getStackForm(1L));
CustomItemList.Machine_Multi_AirFilterT2.set(
new GT_MetaTileEntity_AirFilterT2(
AIR_FILTER_CONTROLLER_T2.ID,
"multimachine.airfilter.02",
"Electric Air Filter T2").getStackForm(1L));
CustomItemList.Machine_Multi_AirFilterT3.set(
new GT_MetaTileEntity_AirFilterT3(
AIR_FILTER_CONTROLLER_T3.ID,
"multimachine.airfilter.03",
"Electric Air Filter T3").getStackForm(1L));
}

private void registerNameRemover() {
CustomItemList.nameRemover
.set(new NameRemover(NAME_REMOVER.ID, "fix.name.remover", "Name Remover", 0).getStackForm(1L));
}

private void registerCircuitAssembler() {
GTModHandler.addCraftingRecipe(
ItemList.CircuitAssemblerUHV.get(1L),
Expand Down
Loading
Loading