Skip to content
This repository has been archived by the owner on Sep 17, 2022. It is now read-only.

Update to the Gregicality 0.23 #5

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,13 @@ repositories {
dependencies {
deobfCompile "mezz.jei:jei_1.12.2:+"
deobfCompile "gregtechce:gregtech:1.12.2:1.17.0.764"
deobfCompile "gregicality:gregicality:1.12.2:0.22.7"
deobfCompile "codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.358:universal"
deobfCompile "codechicken:ChickenASM:1.12-1.0.2.9"
deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.23-16"

compile files(
"libs/Gregicality-1.12.2-0.23-RC.jar",
)
}

jar {
Expand Down
Binary file added libs/Gregicality-1.12.2-0.23-RC.jar
Binary file not shown.
23 changes: 12 additions & 11 deletions src/main/java/com/hjae/gcm/jei/AdvAssemblyLineInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import gregicadditions.jei.GAMultiblockShapeInfo;
import gregicadditions.machines.GATileEntities;
import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
import gregtech.api.unification.material.Materials;
import gregtech.common.blocks.BlockMetalCasing;
import gregtech.common.blocks.BlockMultiblockCasing;
import gregtech.common.blocks.MetaBlocks;
import gregtech.common.metatileentities.MetaTileEntities;
Expand All @@ -31,23 +31,24 @@ public List<MultiblockShapeInfo> getMatchingShapes() {
List<MultiblockShapeInfo> shapes = new ArrayList<>();
for (int i = 0; i < 12; i++) {
GAMultiblockShapeInfo.Builder builder = GAMultiblockShapeInfo.builder();
builder.aisle("COC", "RTR", "GAG", "#Y#");
builder.aisle("FIM", "RTR", "GSG", "#Q#");
for (int num = 0; num < 3 + i; num++) {
if (num == 4 || num == 9) builder.aisle("FCf", "RTR", "GAG", "#Y#");
else builder.aisle("CCC", "RTR", "GAG", "#Y#");
if (num == 4 || num == 9) builder.aisle("FCC", "RTR", "GAG", "#Y#");
else builder.aisle("CCC", "RTR", "GAG", "#C#");
}
builder.aisle("CIC", "RTR", "GSG", "#Y#")
.where('S', GCMTileEntities.ADV_ASSEMBLY_LINE, EnumFacing.SOUTH)
.where('C', GAMetaBlocks.getMetalCasingBlockState(Materials.Steel))
builder.aisle("COC", "RTR", "GAG", "#Y#")
.where('S', GCMTileEntities.ADV_ASSEMBLY_LINE, EnumFacing.NORTH)
.where('M', GATileEntities.MAINTENANCE_HATCH[0], EnumFacing.NORTH)
.where('C', MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.STEEL_SOLID))
.where('F', MetaTileEntities.FLUID_IMPORT_HATCH[4], EnumFacing.WEST)
.where('f', MetaTileEntities.FLUID_IMPORT_HATCH[4], EnumFacing.EAST)
.where('O', MetaTileEntities.ITEM_EXPORT_BUS[4], EnumFacing.DOWN)
.where('O', MetaTileEntities.ITEM_EXPORT_BUS[4], EnumFacing.SOUTH)
.where('Y', MetaTileEntities.ENERGY_INPUT_HATCH[4], EnumFacing.UP)
.where('I', MetaTileEntities.ITEM_IMPORT_BUS[3], EnumFacing.DOWN)
.where('Q', GATileEntities.QBIT_INPUT_HATCH[0], EnumFacing.UP)
.where('I', MetaTileEntities.ITEM_IMPORT_BUS[3], EnumFacing.NORTH)
.where('G', MetaBlocks.MUTLIBLOCK_CASING.getState(BlockMultiblockCasing.MultiblockCasingType.GRATE_CASING))
.where('A', MetaBlocks.MUTLIBLOCK_CASING.getState(BlockMultiblockCasing.MultiblockCasingType.ASSEMBLER_CASING))
.where('R', GAMetaBlocks.TRANSPARENT_CASING.getState(GATransparentCasing.CasingType.IRIDIUM_GLASS))
.where('T', GAMetaBlocks.MUTLIBLOCK_CASING.getState(GAMultiblockCasing.CasingType.TUNGSTENSTEEL_GEARBOX_CASING))
.where('T', GAMetaBlocks.MUTLIBLOCK_CASING.getState(GAMultiblockCasing.CasingType.ASSEMBLY_LINE_CASING))
.where('#', Blocks.AIR.getDefaultState());
shapes.add(builder.build());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ protected BlockPattern createStructurePattern() {
.aisle("#Y#", "GSG", "RTR", "FIF")
.where('S', selfPredicate())
.where('C', statePredicate(getCasingState()))
.where('F', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.IMPORT_FLUIDS)))
.where('F', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.IMPORT_FLUIDS).or(abilityPartPredicate(GregicAdditionsCapabilities.MAINTENANCE_HATCH))))
.where('O', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.EXPORT_ITEMS)))
.where('Y', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.INPUT_ENERGY)).or(abilityPartPredicate(GregicAdditionsCapabilities.INPUT_QBIT)))
.where('I', statePredicate(getCasingState()).or(abilityPartPredicate(MultiblockAbility.IMPORT_ITEMS)))
.where('G', statePredicate(MetaBlocks.MUTLIBLOCK_CASING.getState(BlockMultiblockCasing.MultiblockCasingType.GRATE_CASING)))
.where('A', statePredicate(MetaBlocks.MUTLIBLOCK_CASING.getState(BlockMultiblockCasing.MultiblockCasingType.ASSEMBLER_CASING)))
.where('R', statePredicate(GAMetaBlocks.TRANSPARENT_CASING.getState(GATransparentCasing.CasingType.IRIDIUM_GLASS)))
.where('T', statePredicate(GAMetaBlocks.MUTLIBLOCK_CASING.getState(GAMultiblockCasing.CasingType.TUNGSTENSTEEL_GEARBOX_CASING)))
.where('T', statePredicate(GAMetaBlocks.MUTLIBLOCK_CASING.getState(GAMultiblockCasing.CasingType.ASSEMBLY_LINE_CASING)))
.where('#', (tile) -> true).build();

}
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"pack": {
"description": "examplemod resources",
"pack_format": 3,
"_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)."
}
}