Skip to content

Commit

Permalink
Removed oredict registration of AnyIron, AnyCopper, etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MauveCloud
MauveCloud committed Nov 2, 2017
1 parent 2d8df8d commit 7a27c85
Show file tree
Hide file tree
Showing 10 changed files with 127 additions and 120 deletions.
15 changes: 0 additions & 15 deletions src/main/java/gregtech/api/enums/Materials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/enums/Tier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
10 changes: 5 additions & 5 deletions ...gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aN
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);
Expand Down Expand Up @@ -190,7 +190,7 @@ public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aN
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);
Expand Down Expand Up @@ -258,7 +258,7 @@ public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aN
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:
Expand All @@ -283,10 +283,10 @@ public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aN
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);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/common/GT_Proxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1005,11 +1005,11 @@ else if (this.mInvalidNames.contains(aEvent.Name)) {
case cableGt01:
if (aMaterial == Materials.Tin) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore);
} else if (aMaterial == Materials.AnyCopper) {
} else if (aMaterial == Materials.Copper) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
} else if (aMaterial == Materials.Gold) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore);
} else if (aMaterial == Materials.AnyIron) {
} else if (aMaterial == Materials.Iron) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireIron, aEvent.Ore);
}
break;
Expand Down
Loading

0 comments on commit 7a27c85

Please sign in to comment.