Skip to content

Commit

Permalink
Migrate coremod casings to GT5u (#1130)
Browse files Browse the repository at this point in the history 
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
  • Loading branch information
@serenibyss @Dream-Master @chochem
3 people authored Jan 7, 2025
1 parent 4fec67d commit 8fa48b0
Show file tree
Hide file tree
Showing 12 changed files with 72 additions and 243 deletions.
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.52:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.56:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

Expand All @@ -12,7 +12,7 @@ dependencies {
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.16:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/com/dreammaster/creativetab/ModTabList.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package com.dreammaster.creativetab;

import static com.dreammaster.gthandler.casings.GT_Container_CasingsNH.sBlockCasingsNH;

import java.util.List;

import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

import com.dreammaster.gthandler.CustomItemList;
import com.dreammaster.item.ItemList;
Expand Down Expand Up @@ -59,13 +56,6 @@ public static void InitModTabs(CreativeTabsManager pTabManager, ModItemManager p

@Override
public void displayAllReleventItems(List stuffToShow) {
// casing adder
for (int i = 0; i < 16; ++i) {
ItemStack aStack = new ItemStack(sBlockCasingsNH, 1, i);
if (!aStack.getDisplayName().contains(".name")) {
stuffToShow.add(aStack);
}
}
// te adder
for (CustomItemList item : CustomItemList.values()) {
if (item.hasBeenSet() && item.getBlock() == GregTechAPI.sBlockMachines) {
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/com/dreammaster/gthandler/CustomItemList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,9 @@

public enum CustomItemList implements IItemContainer {

Casing_Pyrolyse,
Machine_Multi_AirFilterT1,
Machine_Multi_AirFilterT2,
Machine_Multi_AirFilterT3,
Casing_AirFilter_Vent_T1,
Casing_AirFilter_Turbine_T1,
Casing_AirFilter_Vent_T2,
Casing_AirFilter_Turbine_T2,
Casing_AirFilter_Vent_T3,
Casing_AirFilter_Turbine_T3,
// todo: remap them to GT5U namespace
@Deprecated
Casing_UEV,
@Deprecated
Casing_UIV,
@Deprecated
Casing_UMV,
@Deprecated
Casing_UXV,
@Deprecated
Casing_MAXV,

// CoreModItems
EtchedLowVoltageWiring,
Expand Down
36 changes: 18 additions & 18 deletions src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,20 @@ private static boolean addRollingMachineRecipe(ItemStack aResult, Object[] aReci
public void run() {
// UEV, UIV, UMV, UXV casings
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_UEV.get(1L),
ItemList.Casing_UEV.get(1L),
bits,
new Object[] { "PPP", "PwP", "PPP", 'P', OrePrefixes.plate.get(Materials.Bedrockium) });
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_UIV.get(1L),
ItemList.Casing_UIV.get(1L),
bits,
new Object[] { "PPP", "PwP", "PPP", 'P', OrePrefixes.plate.get(Materials.BlackPlutonium) });
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_UMV.get(1L),
ItemList.Casing_UMV.get(1L),
bits,
new Object[] { "PPP", "PwP", "PPP", 'P', OrePrefixes.plate.get(MaterialsUEVplus.SpaceTime) });

GTModHandler.addCraftingRecipe(
CustomItemList.Casing_UXV.get(1L),
ItemList.Casing_UXV.get(1L),
bits,
new Object[] { "PSP", "SwS", "PSP", 'P',
OrePrefixes.plate.get(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter), 'S',
Expand All @@ -125,25 +125,25 @@ public void run() {
// Hull recycling placed here after the casing recipes for proper item data
GTOreDictUnificator.addItemDataFromInputs(
ItemList.Hull_UEV.get(1L),
CustomItemList.Casing_UEV.get(1L),
ItemList.Casing_UEV.get(1L),
OrePrefixes.cableGt08.get(Materials.Draconium),
OrePrefixes.cableGt08.get(Materials.Draconium));

GTOreDictUnificator.addItemDataFromInputs(
ItemList.Hull_UIV.get(1L),
CustomItemList.Casing_UIV.get(1L),
ItemList.Casing_UIV.get(1L),
OrePrefixes.cableGt08.get(Materials.NetherStar),
OrePrefixes.cableGt08.get(Materials.NetherStar));

GTOreDictUnificator.addItemDataFromInputs(
ItemList.Hull_UMV.get(1L),
CustomItemList.Casing_UMV.get(1L),
ItemList.Casing_UMV.get(1L),
OrePrefixes.wireGt12.get(Materials.Quantium),
OrePrefixes.wireGt12.get(Materials.Quantium));

GTOreDictUnificator.addItemDataFromInputs(
ItemList.Hull_UXV.get(1L),
CustomItemList.Casing_UXV.get(1L),
ItemList.Casing_UXV.get(1L),
OrePrefixes.wireGt16.get(Materials.BlackPlutonium),
OrePrefixes.wireGt16.get(Materials.BlackPlutonium));

Expand Down Expand Up @@ -600,14 +600,14 @@ public void run() {

// Air filter multi blocks
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_AirFilter_Vent_T1.get(1L),
ItemList.Casing_AirFilter_Vent_T1.get(1L),
bits,
new Object[] { "ThT", "TFT", "TwT", 'T', CustomItemList.SteelBars, 'F',
OrePrefixes.frameGt.get(Materials.Steel) });
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_AirFilter_Turbine_T1.get(1L),
ItemList.Casing_AirFilter_Turbine_T1.get(1L),
bits,
new Object[] { "SSS", "RVR", "MSM", 'V', CustomItemList.Casing_AirFilter_Vent_T1, 'S',
new Object[] { "SSS", "RVR", "MSM", 'V', ItemList.Casing_AirFilter_Vent_T1, 'S',
OrePrefixes.stickLong.get(Materials.Steel), 'R', OrePrefixes.rotor.get(Materials.Steel), 'M',
ItemList.Electric_Motor_LV, 'R', OrePrefixes.screw.get(Materials.Steel) });
GTModHandler.addCraftingRecipe(
Expand All @@ -617,14 +617,14 @@ public void run() {
'P', ItemList.Electric_Pump_LV, 'M', ItemList.Electric_Motor_LV, 'C',
OrePrefixes.cableGt01.get(Materials.Copper), 'G', ItemList.Casing_Turbine });
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_AirFilter_Vent_T2.get(1L),
ItemList.Casing_AirFilter_Vent_T2.get(1L),
bits,
new Object[] { "ThT", "TFT", "TwT", 'T', CustomItemList.TitaniumBars, 'F',
OrePrefixes.frameGt.get(Materials.Titanium) });
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_AirFilter_Turbine_T2.get(1L),
ItemList.Casing_AirFilter_Turbine_T2.get(1L),
bits,
new Object[] { "SSS", "RVR", "MSM", 'V', CustomItemList.Casing_AirFilter_Vent_T2, 'S',
new Object[] { "SSS", "RVR", "MSM", 'V', ItemList.Casing_AirFilter_Vent_T2, 'S',
OrePrefixes.stickLong.get(Materials.Titanium), 'R', OrePrefixes.rotor.get(Materials.Titanium),
'M', ItemList.Electric_Motor_HV, 'R', OrePrefixes.screw.get(Materials.Titanium) });
GTModHandler.addCraftingRecipe(
Expand All @@ -635,14 +635,14 @@ public void run() {
ItemList.Electric_Motor_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'G',
ItemList.Casing_Turbine2 });
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_AirFilter_Vent_T3.get(1L),
ItemList.Casing_AirFilter_Vent_T3.get(1L),
bits,
new Object[] { "ThT", "TFT", "TwT", 'T', CustomItemList.TungstenSteelBars, 'F',
OrePrefixes.frameGt.get(Materials.TungstenSteel) });
GTModHandler.addCraftingRecipe(
CustomItemList.Casing_AirFilter_Turbine_T3.get(1L),
ItemList.Casing_AirFilter_Turbine_T3.get(1L),
bits,
new Object[] { "SSS", "RVR", "MSM", 'V', CustomItemList.Casing_AirFilter_Vent_T3, 'S',
new Object[] { "SSS", "RVR", "MSM", 'V', ItemList.Casing_AirFilter_Vent_T3, 'S',
OrePrefixes.stickLong.get(Materials.TungstenSteel), 'R',
OrePrefixes.rotor.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'R',
OrePrefixes.screw.get(Materials.TungstenSteel) });
Expand All @@ -655,7 +655,7 @@ public void run() {
ItemList.Casing_Turbine3 });

GTModHandler.addCraftingRecipe(
CustomItemList.Casing_Pyrolyse.get(1L),
ItemList.Casing_Pyrolyse.get(1L),
bits,
new Object[] { "PhP", "SFS", "PwP", 'P', OrePrefixes.plate.get(Materials.Steel), 'S',
OrePrefixes.plate.get(Materials.Iron), 'F', ItemList.Casing_BronzePlatedBricks });
Expand Down
14 changes: 0 additions & 14 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_CasingNH.java
View file

This file was deleted.

8 changes: 4 additions & 4 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 @@ -84,31 +84,31 @@ public void recipes() {
GTModHandler.addCraftingRecipe(
ItemList.Hull_UEV.get(1L),
GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
new Object[] { "PHP", "WMW", 'M', CustomItemList.Casing_UEV, 'W',
new Object[] { "PHP", "WMW", 'M', ItemList.Casing_UEV, 'W',
OrePrefixes.cableGt08.get(Materials.Draconium), 'H',
OrePrefixes.plate.get(Materials.Bedrockium), 'P',
OrePrefixes.plateDouble.get(Materials.Polybenzimidazole) });

GTModHandler.addCraftingRecipe(
ItemList.Hull_UIV.get(1L),
GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
new Object[] { "PHP", "WMW", 'M', CustomItemList.Casing_UIV, 'W',
new Object[] { "PHP", "WMW", 'M', ItemList.Casing_UIV, 'W',
OrePrefixes.cableGt08.get(Materials.NetherStar), 'H',
OrePrefixes.plate.get(Materials.BlackPlutonium), 'P',
OrePrefixes.plateDouble.get(Materials.Polybenzimidazole) });

GTModHandler.addCraftingRecipe(
ItemList.Hull_UMV.get(1L),
GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
new Object[] { "PHP", "WMW", 'M', CustomItemList.Casing_UMV, 'W',
new Object[] { "PHP", "WMW", 'M', ItemList.Casing_UMV, 'W',
OrePrefixes.wireGt12.get(Materials.Quantium), 'H',
OrePrefixes.plate.get(MaterialsUEVplus.SpaceTime), 'P',
OrePrefixes.plateDouble.get(Materials.Polybenzimidazole) });

GTModHandler.addCraftingRecipe(
ItemList.Hull_UXV.get(1L),
GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
new Object[] { "PHP", "WMW", 'M', CustomItemList.Casing_UXV, 'W',
new Object[] { "PHP", "WMW", 'M', ItemList.Casing_UXV, 'W',
OrePrefixes.wireGt16.get(Materials.BlackPlutonium), 'H',
OrePrefixes.plate.get(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter), 'P',
OrePrefixes.plateDense.get(MaterialsKevlar.Kevlar) });
Expand Down
93 changes: 0 additions & 93 deletions src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java
View file

This file was deleted.

13 changes: 0 additions & 13 deletions src/main/java/com/dreammaster/gthandler/casings/GT_Container_CasingsNH.java
View file

This file was deleted.

15 changes: 0 additions & 15 deletions src/main/java/com/dreammaster/gthandler/casings/GT_Item_CasingsNH.java
View file

This file was deleted.

Loading

0 comments on commit 8fa48b0

Please sign in to comment.