diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-11-05 18:11:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-05 18:11:12 +0100 |
| commit | ce4d0b705d682e85412741ac4e087413b75637ef (patch) | |
| tree | 9e57de6b37a82e95d9aecb09bc7d787ce0bb4e1c /src/main/java/gregtech/api | |
| parent | 2a466bb76ea96756a16fdcb1a85622db70a5d9c4 (diff) | |
| parent | 7a27c859a826509828ff505c89a9c1e04f5af5ca (diff) | |
| download | GT5-Unofficial-ce4d0b705d682e85412741ac4e087413b75637ef.tar.gz GT5-Unofficial-ce4d0b705d682e85412741ac4e087413b75637ef.tar.bz2 GT5-Unofficial-ce4d0b705d682e85412741ac4e087413b75637ef.zip | |
Merge pull request #1269 from MauveCloud/unstable
Removed oredict registration of AnyIron, AnyCopper, etc.
Diffstat (limited to 'src/main/java/gregtech/api')
3 files changed, 6 insertions, 21 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index de1973a8e9..9473bbddf1 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -841,22 +841,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { static { initSubTags(); - Iron .mOreReRegistrations.add(AnyIron ); - PigIron .mOreReRegistrations.add(AnyIron ); - WroughtIron .mOreReRegistrations.add(AnyIron ); - Copper .mOreReRegistrations.add(AnyCopper ); - AnnealedCopper .mOreReRegistrations.add(AnyCopper ); - - Bronze .mOreReRegistrations.add(AnyBronze ); - - Rubber .mOreReRegistrations.add(AnyRubber); - StyreneButadieneRubber .mOreReRegistrations.add(AnyRubber); - Silicone .mOreReRegistrations.add(AnyRubber); - - StyreneButadieneRubber .mOreReRegistrations.add(AnySyntheticRubber); - Silicone .mOreReRegistrations.add(AnySyntheticRubber); - Peanutwood .setMaceratingInto(Wood ); WoodSealed .setMaceratingInto(Wood ); NetherBrick .setMaceratingInto(Netherrack ); diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java index c40a4d8ed2..8ad7d3af0c 100644 --- a/src/main/java/gregtech/api/enums/Tier.java +++ b/src/main/java/gregtech/api/enums/Tier.java @@ -8,7 +8,7 @@ public class Tier { ELECTRIC = new Tier[]{ new Tier(SubTag.ENERGY_ELECTRICITY, 0, 8, 1, 1, 1, Materials.WroughtIron, ItemList.Hull_ULV, OrePrefixes.cableGt01.get(Materials.Lead), OrePrefixes.cableGt04.get(Materials.Lead), OrePrefixes.circuit.get(Materials.Primitive), OrePrefixes.circuit.get(Materials.Basic)), new Tier(SubTag.ENERGY_ELECTRICITY, 1, 32, 1, 1, 1, Materials.Steel, ItemList.Hull_LV, OrePrefixes.cableGt01.get(Materials.Tin), OrePrefixes.cableGt04.get(Materials.Tin), OrePrefixes.circuit.get(Materials.Basic), OrePrefixes.circuit.get(Materials.Good)), - new Tier(SubTag.ENERGY_ELECTRICITY, 2, 128, 1, 1, 1, Materials.Aluminium, ItemList.Hull_MV, OrePrefixes.cableGt01.get(Materials.AnyCopper), OrePrefixes.cableGt04.get(Materials.AnyCopper), OrePrefixes.circuit.get(Materials.Good), OrePrefixes.circuit.get(Materials.Advanced)), + new Tier(SubTag.ENERGY_ELECTRICITY, 2, 128, 1, 1, 1, Materials.Aluminium, ItemList.Hull_MV, OrePrefixes.cableGt01.get(Materials.Copper), OrePrefixes.cableGt04.get(Materials.Copper), OrePrefixes.circuit.get(Materials.Good), OrePrefixes.circuit.get(Materials.Advanced)), new Tier(SubTag.ENERGY_ELECTRICITY, 3, 512, 1, 1, 1, Materials.StainlessSteel, ItemList.Hull_HV, OrePrefixes.cableGt01.get(Materials.Gold), OrePrefixes.cableGt04.get(Materials.Gold), OrePrefixes.circuit.get(Materials.Advanced), OrePrefixes.circuit.get(Materials.Data)), new Tier(SubTag.ENERGY_ELECTRICITY, 4, 2048, 1, 1, 1, Materials.Titanium, ItemList.Hull_EV, OrePrefixes.cableGt01.get(Materials.Aluminium), OrePrefixes.cableGt04.get(Materials.Aluminium), OrePrefixes.circuit.get(Materials.Data), OrePrefixes.circuit.get(Materials.Elite)), new Tier(SubTag.ENERGY_ELECTRICITY, 5, 8192, 1, 1, 1, Materials.TungstenSteel, ItemList.Hull_IV, OrePrefixes.cableGt01.get(Materials.Platinum), OrePrefixes.cableGt04.get(Materials.Platinum), OrePrefixes.circuit.get(Materials.Elite), OrePrefixes.circuit.get(Materials.Master)), diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index 06a115d3d4..ad808f3a71 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -156,7 +156,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ switch (mTier) { case 0: case 1: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.AnyCopper); + aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Copper); break; case 2: aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Cupronickel); @@ -190,7 +190,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ switch (mTier) { case 0: case 1: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.AnyCopper); + aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Copper); break; case 2: aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Cupronickel); @@ -258,7 +258,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ switch (mTier) { case 0: case 1: - aRecipe[i] = OrePrefixes.stick.get(Materials.AnyIron); + aRecipe[i] = OrePrefixes.stick.get(Materials.Iron); break; case 2: case 3: @@ -283,10 +283,10 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Tin); break; case 2: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.AnyCopper); + aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Copper); break; case 3: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.AnyCopper); + aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Copper); break; case 4: aRecipe[i] = OrePrefixes.wireGt08.get(Materials.AnnealedCopper); |