aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLewisSaber <39595617+LewisSaber@users.noreply.github.com>2023-02-23 21:03:16 +0200
committerGitHub <noreply@github.com>2023-02-23 20:03:16 +0100
commitdf98d247b98a6c9087dae379f4bf7cdbea0cf816 (patch)
treecaa5c630f18402264e7915a6c31addd03c420a81
parentd29d610bf58628097005131e691374857a10f9d4 (diff)
downloadGT5-Unofficial-df98d247b98a6c9087dae379f4bf7cdbea0cf816.tar.gz
GT5-Unofficial-df98d247b98a6c9087dae379f4bf7cdbea0cf816.tar.bz2
GT5-Unofficial-df98d247b98a6c9087dae379f4bf7cdbea0cf816.zip
Make PrAss Accept EV+ glass (#138)
* Add alternative recipe to circuits * Add glass Variants to PrAss
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java7
-rw-r--r--src/main/resources/assets/goodgenerator/lang/en_US.lang3
-rw-r--r--src/main/resources/assets/goodgenerator/lang/zh_CN.lang2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
index c493efe263..b403103d49 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java
@@ -1,5 +1,6 @@
package goodgenerator.blocks.tileEntity;
+import static com.github.bartimaeusnek.bartworks.util.BW_Util.ofGlassTieredMixed;
import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput;
import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
@@ -11,7 +12,6 @@ import java.util.ArrayList;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
@@ -47,7 +47,6 @@ import gregtech.api.util.GT_HatchElementBuilder;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
-import ic2.core.Ic2Items;
public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<PreciseAssembler>
implements IConstructable, ISurvivalConstructable {
@@ -111,7 +110,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci
PreciseAssembler::setCasingTier,
PreciseAssembler::getCasingTier))))
.addElement('F', ofFrame(Materials.TungstenSteel))
- .addElement('G', ofBlock(Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0))
+ .addElement('G', ofGlassTieredMixed((byte) 4, (byte) 127, 2))
.addElement(
'M',
StructureUtility.ofBlocksTiered(
@@ -354,7 +353,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci
@Override
public String[] getStructureDescription(ItemStack stackSize) {
- return DescTextLocalization.addText("PreciseAssembler.hint", 6);
+ return DescTextLocalization.addText("PreciseAssembler.hint", 7);
}
@Override
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index f116e9f2a2..af060b7225 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -387,7 +387,8 @@ PreciseAssembler.hint.1=12x Tungstensteel Frame Box
PreciseAssembler.hint.2=42x Reinforced Glasses
PreciseAssembler.hint.3=21x Machine Casing (Not Machine Hull!)
PreciseAssembler.hint.4=1 - Any Hatch/Precise Electronic Unit Casing
-PreciseAssembler.hint.5=Support TecTech Energy Hatches!
+PreciseAssembler.hint.5=2 - EV+ Tier Glass
+PreciseAssembler.hint.6=Support TecTech Energy Hatches!
LargeFusion1.hint.0=At least 1666x LuV Machine Casings
LargeFusion1.hint.1=At least 63x Chrome Reinforced Borosilicate Glass Blocks
LargeFusion1.hint.2=558x Ameliorated Superconduct Coils
diff --git a/src/main/resources/assets/goodgenerator/lang/zh_CN.lang b/src/main/resources/assets/goodgenerator/lang/zh_CN.lang
index 6917fc1f20..72b024df68 100644
--- a/src/main/resources/assets/goodgenerator/lang/zh_CN.lang
+++ b/src/main/resources/assets/goodgenerator/lang/zh_CN.lang
@@ -345,7 +345,7 @@ PreciseAssembler.hint.1=12x钨钢框架
PreciseAssembler.hint.2=42x防爆玻璃
PreciseAssembler.hint.3=21x机械方块(不是机器外壳!)
PreciseAssembler.hint.4=1 - 输入仓/输入总线/输出总线/精密电子单元机械方块
-PreciseAssembler.hint.5=支持 TecTech能源仓!
+PreciseAssembler.hint.6=支持 TecTech能源仓!
LargeFusion1.hint.0=1666xLuV机械方块(至少!)
LargeFusion1.hint.1=63x铬强化硼玻璃方块(至少!)
LargeFusion1.hint.2=558x改良型超导线圈方块