diff options
author | miozune <miozune@gmail.com> | 2022-05-19 19:39:15 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-19 12:39:15 +0200 |
commit | c2a2657eed0c1cf0f0197cde6376e41f69632ac5 (patch) | |
tree | 7b0205b51e5dbe356765bd5a9db1dba200573676 /src/main | |
parent | e1d382876b552ff5d01b8d2cdc5152dd799fd1b5 (diff) | |
download | GT5-Unofficial-c2a2657eed0c1cf0f0197cde6376e41f69632ac5.tar.gz GT5-Unofficial-c2a2657eed0c1cf0f0197cde6376e41f69632ac5.tar.bz2 GT5-Unofficial-c2a2657eed0c1cf0f0197cde6376e41f69632ac5.zip |
Fix oredict for UV/UHV Superconductor Rod (#1054)
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 8c7f8b7c57..34353981e1 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -475,7 +475,7 @@ public enum OrePrefixes { plateQuadruple.mGeneratedItems.add(Materials.Paper); plateQuintuple.mGeneratedItems.add(Materials.Paper); ring.mGeneratedItems.add(Materials.Paper); - + lens.mGeneratedItems.add(Materials.EnderPearl); lens.mGeneratedItems.add(Materials.EnderEye); @@ -735,7 +735,7 @@ public enum OrePrefixes { if (!enableUnusedRings && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome || aMaterial == Materials.Iron || aMaterial == Materials.Tin || aMaterial == Materials.Osmium || aMaterial == Materials.Iridium || aMaterial == Materials.Bronze || aMaterial == Materials.WroughtIron || aMaterial == Materials.Steel || aMaterial == Materials.StainlessSteel || aMaterial == Materials.PigIron || aMaterial == Materials.TungstenSteel || - aMaterial == Materials.Rubber || aMaterial == Materials.HSSE || aMaterial == Materials.Neutronium || aMaterial == Materials.HSSG || aMaterial == Materials.Aluminium || + aMaterial == Materials.Rubber || aMaterial == Materials.HSSE || aMaterial == Materials.Neutronium || aMaterial == Materials.HSSG || aMaterial == Materials.Aluminium || aMaterial == Materials.Invar || aMaterial == Materials.Brass || aMaterial == Materials.Paper || aMaterial == Materials.Silicone || aMaterial == Materials.StyreneButadieneRubber)) ring.mDisabledItems.add(aMaterial); //Foil @@ -744,8 +744,8 @@ public enum OrePrefixes { aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Steel || aMaterial == Materials.Copper || aMaterial == Materials.YttriumBariumCuprate || aMaterial == Materials.VanadiumGallium || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.Naquadah || aMaterial == Materials.Manganese || aMaterial == Materials.Plastic || aMaterial == Materials.Silicone || aMaterial == Materials.PolyvinylChloride || aMaterial == Materials.PolyphenyleneSulfide || - aMaterial == Materials.Nichrome || aMaterial == Materials.BlackSteel || aMaterial == Materials.Titanium || aMaterial == Materials.TungstenSteel || - aMaterial == Materials.Tungsten || aMaterial == Materials.HSSG || aMaterial == Materials.NaquadahAlloy || aMaterial == Materials.Duranium || + aMaterial == Materials.Nichrome || aMaterial == Materials.BlackSteel || aMaterial == Materials.Titanium || aMaterial == Materials.TungstenSteel || + aMaterial == Materials.Tungsten || aMaterial == Materials.HSSG || aMaterial == Materials.NaquadahAlloy || aMaterial == Materials.Duranium || aMaterial == Materials.Europium || aMaterial == Materials.Bedrockium)) foil.mDisabledItems.add(aMaterial); @@ -786,7 +786,7 @@ public enum OrePrefixes { aMaterial == Materials.Americium || aMaterial == Materials.Neutronium || aMaterial == Materials.Bronze || aMaterial == Materials.Brass || aMaterial == Materials.Electrum || aMaterial == Materials.NaquadahEnriched || aMaterial == Materials.CobaltBrass || aMaterial == Materials.IronMagnetic || aMaterial == Materials.SteelMagnetic || aMaterial == Materials.NeodymiumMagnetic || aMaterial == Materials.Samarium || aMaterial == Materials.SamariumMagnetic || aMaterial == Materials.VanadiumGallium || aMaterial == Materials.Diamond || - aMaterial == Materials.Wood || aMaterial == Materials.Plastic || aMaterial == Materials.Lead || aMaterial == Materials.SolderingAlloy || aMaterial == Materials.Lapis || + aMaterial == Materials.Wood || aMaterial == Materials.Plastic || aMaterial == Materials.Lead || aMaterial == Materials.SolderingAlloy || aMaterial == Materials.Lapis || aMaterial == Materials.Lazurite || aMaterial == Materials.Sodalite|| aMaterial == Materials.PolyvinylChloride)) stick.mDisabledItems.add(aMaterial); //Long Rods @@ -846,6 +846,8 @@ public enum OrePrefixes { if (tPrefix == oreNether && aOre.equals("oreNetherQuartz")) return ore; if (tPrefix == oreNether && aOre.equals("oreNetherStar")) return ore; if (tPrefix == oreBasalt && aOre.equals("oreBasalticMineralSand")) return ore; + if (tPrefix == stickLong && aOre.equals("stickLongasssuperconductornameforuvwire")) return stick; + if (tPrefix == stickLong && aOre.equals("stickLongasssuperconductornameforuhvwire")) return stick; return tPrefix; } return null; |