aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-12-09 18:50:05 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-12-09 18:50:05 +0100
commit00ab9ee56f81e6fe4e0234b2a8cd3a7e44ecb4b0 (patch)
tree5bce49057d504776d7dc57a5e16d7f952991d00b /src/main
parentbde05cbe2d7ffa95a7dce10dc309788c5b0cbc72 (diff)
downloadGT5-Unofficial-00ab9ee56f81e6fe4e0234b2a8cd3a7e44ecb4b0.tar.gz
GT5-Unofficial-00ab9ee56f81e6fe4e0234b2a8cd3a7e44ecb4b0.tar.bz2
GT5-Unofficial-00ab9ee56f81e6fe4e0234b2a8cd3a7e44ecb4b0.zip
fixed problems with vanilla gt5u
+ inlined an else statement Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: f46f6f19f8a44f45b582c2cbe7802d06df6c471a
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java3
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java
index 3494b461a5..4de38a0e55 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java
@@ -76,10 +76,8 @@ public class BW_GT_ItemRenderer implements IItemRenderer {
if (RenderItem.renderInFrame) {
GL11.glScalef(0.85F, 0.85F, 0.85F);
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
- GL11.glTranslated(-0.5D, -0.42D, 0.0D);
- } else {
- GL11.glTranslated(-0.5D, -0.42D, 0.0D);
}
+ GL11.glTranslated(-0.5D, -0.42D, 0.0D);
}
GL11.glColor3f(1.0F, 1.0F, 1.0F);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
index ff7d384dc3..74c60fb27e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
@@ -366,8 +366,9 @@ public class PlatinumSludgeOverHaul {
PlatinumSludgeOverHaul.runHelperrecipes();
}
+ @SuppressWarnings("deprecation")
private static void replaceHVCircuitMaterials(){
- GT_Values.RA.addMixerRecipe(Materials.Redstone.getDust(1),Materials.Electrum.getDust(1),GT_Utility.getIntegratedCircuit(1),null,null,null,Materials.Electrotine.getDust(8),1800,120);
+ GT_Values.RA.addMixerRecipe(Materials.Redstone.getDust(1),Materials.Electrum.getDust(1),GT_Utility.getIntegratedCircuit(1),null,null,null,Materials.Nikolite.getDust(8),1800,120);
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.mRecipeList){
if (recipe.mEUt > 512)
continue;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
index f66c2d5d2c..807db1f804 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
@@ -49,6 +49,7 @@ import static gregtech.api.enums.OrePrefixes.*;
public class AdditionalRecipes implements Runnable {
@Override
+ @SuppressWarnings("deprecation")
public void run() {
((BWRecipes.BW_Recipe_Map_LiquidFuel)BWRecipes.instance.getMappingsFor((byte) 2)).addLiquidFuel(WerkstoffLoader.FormicAcid.getBridgeMaterial(),40);
//Thorium/Yttrium Glas
@@ -86,7 +87,7 @@ public class AdditionalRecipes implements Runnable {
//Milk
//GT_Values.RA.addFusionReactorRecipe(WerkstoffLoader.Californium.getMolten(16), Materials.Milk.getFluid(12000), WerkstoffLoader.Oganesson.getFluidOrGas(16), 500, 49152, 600000000);
- GT_Values.RA.addCentrifugeRecipe(GT_Utility.getIntegratedCircuit(1),null,Materials.Milk.getFluid(10000),Materials.Water.getFluid(8832),Materials.Sugar.getDustSmall(21),Materials.Calcium.getDustTiny(1),Materials.Magnesium.getDustTiny(1),Materials.Potassium.getDustTiny(1),Materials.Sodium.getDustTiny(4),Materials.Phosphorus.getDustTiny(1),new int[]{10000,10000,1000,10000,1000,1000},50,120);
+ GT_Values.RA.addCentrifugeRecipe(GT_Utility.getIntegratedCircuit(1),null,Materials.Milk.getFluid(10000),Materials.Water.getFluid(8832),Materials.Sugar.getDustSmall(21),Materials.Calcium.getDustTiny(1),Materials.Magnesium.getDustTiny(1),Materials.Potassium.getDustTiny(1),Materials.Sodium.getDustTiny(4),Materials.Phosphor.getDustTiny(1),new int[]{10000,10000,1000,10000,1000,1000},50,120);
for (int i = 0; i <= 6; i++) {
GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.add(