diff options
Diffstat (limited to 'main/java/gregtech')
103 files changed, 3854 insertions, 4542 deletions
diff --git a/main/java/gregtech/api/objects/GT_FluidStack.java b/main/java/gregtech/api/objects/GT_FluidStack.java index 96b1517e9b..12735101ca 100644 --- a/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/main/java/gregtech/api/objects/GT_FluidStack.java @@ -29,18 +29,18 @@ public class GT_FluidStack extends FluidStack { } public static void fixAllThoseFuckingFluidIDs() { - //for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); - //for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) try {GT_Utility.reMap(tMap);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} + for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); + for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) try {GT_Utility.reMap(tMap);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} } public void fixFluidIDForFucksSake() { - //int fluidID = this.getFluidID(); - //try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;} + int fluidID = this.getFluid().getID(); + try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;} } @Override public FluidStack copy() { - //fixFluidIDForFucksSake(); + fixFluidIDForFucksSake(); return new GT_FluidStack(this); } }
\ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Ores.java b/main/java/gregtech/common/blocks/GT_Block_Ores.java index 5186456e40..19bf814a31 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -96,35 +96,15 @@ /* 96: 83 */ FUCKING_LOCK = false;
/* 97: */ }
/* 98: */
-/* 99: */ public String getLocalizedName(Materials aMaterial)
-/* 100: */ {
-/* 101: 87 */ switch (aMaterial.ordinal())
-/* 102: */ {
-/* 103: */ case 1:
-/* 104: */ case 2:
-/* 105: */ case 3:
-/* 106: */ case 4:
-/* 107: */ case 5:
-/* 108: */ case 6:
-/* 109: */ case 7:
-/* 110: */ case 8:
-/* 111: 89 */ return aMaterial.mDefaultLocalName + " Infused Stone";
-/* 112: */ case 9:
-/* 113: */ case 10:
-/* 114: */ case 11:
-/* 115: */ case 12:
-/* 116: */ case 13:
-/* 117: */ case 14:
-/* 118: */ case 15:
-/* 119: */ case 16:
-/* 120: */ case 17:
-/* 121: */ case 18:
-/* 122: */ case 19:
-/* 123: */ case 20:
-/* 124: 91 */ return aMaterial.mDefaultLocalName;
-/* 125: */ }
-/* 126: 93 */ return aMaterial.mDefaultLocalName + OrePrefixes.ore.mLocalizedMaterialPost;
-/* 127: */ }
+/* 99: */ public String getLocalizedName(Materials aMaterial) {
+ /* 87 */ switch (aMaterial) {
+ /* */ case InfusedAir: case InfusedDull: case InfusedEarth: case InfusedEntropy: case InfusedFire: case InfusedOrder: case InfusedVis: case InfusedWater:
+ /* 89 */ return aMaterial.mDefaultLocalName + " Infused Stone";
+ /* */ case Vermiculite: case Bentonite: case Kaolinite: case Talc: case BasalticMineralSand: case GraniticMineralSand: case GlauconiteSand: case CassiteriteSand: case GarnetSand: case QuartzSand: case Pitchblende: case FullersEarth:
+ /* 91 */ return aMaterial.mDefaultLocalName;
+ /* */ }
+ /* 93 */ return aMaterial.mDefaultLocalName + OrePrefixes.ore.mLocalizedMaterialPost;
+ /* */ }
/* 128: */
/* 129: */ public boolean onBlockEventReceived(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_)
/* 130: */ {
diff --git a/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java index ded7e05d74..0338dadee0 100644 --- a/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java +++ b/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java @@ -240,7 +240,7 @@ import gregtech.api.enums.Textures; /* 237: */ {
/* 238:210 */ Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)];
/* 239:211 */ if ((aMaterial != null) && (this.mMetaData < 32000)) {
-/* 240:211 */ return new ITexture[] { mStoneTextures[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa) };
+/* 240:211 */ return new ITexture[] { mStoneTextures[(this.mMetaData / 1000 % 16)], new GT_RenderedTexture(aMaterial.mIconSet.mTextures[this.mMetaData/16000 ==0 ? OrePrefixes.ore.mTextureIndex:OrePrefixes.oreSmall.mTextureIndex], aMaterial.mRGBa) };
/* 241: */ }
/* 242:212 */ return new ITexture[] { mStoneTextures[0], new GT_RenderedTexture(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.ore.mTextureIndex]) };
/* 243: */ }
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 5e8cf38a8f..946cb78876 100644 --- a/ |