From 396f927dc621680339c54750dfd5cd2f7a215767 Mon Sep 17 00:00:00 2001 From: screret <68943070+screret@users.noreply.github.com> Date: Wed, 8 Nov 2023 20:12:03 +0200 Subject: [PATCH] update GT, disable space station packager JEI preview --- CHANGELOG.md | 5 ++-- .../java/argent_matter/gcyr/GCyRGTAddon.java | 27 +++++++++++++++++-- .../common/data/GCyRCreativeModeTabs.java | 2 +- .../gcyr/common/data/GCyRMachines.java | 8 +++--- forge/src/main/resources/META-INF/mods.toml | 2 +- gradle.properties | 2 +- settings.gradle | 4 +-- 7 files changed, 36 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a8e28ff..2f16dbfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,4 @@ -- add satellite packaging machine (slightly nonfunctional) -- make space not have the starting platform, rocket places it from the package. -- fix GT compat. +- update GT +- disable space station packager preview example for now, until I figure out how to fix it. WARNING: space station doesn't build correctly just yet. \ No newline at end of file diff --git a/common/src/main/java/argent_matter/gcyr/GCyRGTAddon.java b/common/src/main/java/argent_matter/gcyr/GCyRGTAddon.java index 5d43d547..de7b27a4 100644 --- a/common/src/main/java/argent_matter/gcyr/GCyRGTAddon.java +++ b/common/src/main/java/argent_matter/gcyr/GCyRGTAddon.java @@ -4,10 +4,22 @@ import com.gregtechceu.gtceu.api.addon.GTAddon; import com.gregtechceu.gtceu.api.addon.IGTAddon; import com.gregtechceu.gtceu.api.addon.events.MaterialCasingCollectionEvent; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.data.worldgen.SimpleWorldGenLayer; +import com.gregtechceu.gtceu.api.data.worldgen.WorldGeneratorUtils; import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; +import java.util.Set; import java.util.function.Consumer; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.Conditions.hasOreProperty; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.LoaderType.FABRIC; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.LoaderType.FORGE; + @GTAddon public class GCyRGTAddon implements IGTAddon { @Override @@ -22,7 +34,13 @@ public String addonModId() { @Override public void registerTagPrefixes() { - IGTAddon.super.registerTagPrefixes(); + TagPrefix.oreTagPrefix("moon") + .langValue("Moon %s Ore") + .materialIconType(MaterialIconType.ore) + .miningToolTag(BlockTags.MINEABLE_WITH_PICKAXE) + .unificationEnabled(true) + .generationCondition(hasOreProperty) + .registerOre(() -> GCyRBlocks.MOON_STONE.orElse(Blocks.STONE).defaultBlockState()); } @Override @@ -47,7 +65,12 @@ public void registerCovers() { @Override public void registerWorldgenLayers() { - IGTAddon.super.registerWorldgenLayers(); + WorldGeneratorUtils.WORLD_GEN_LAYERS.put("moon", new SimpleWorldGenLayer("moon", () -> new BlockMatchTest(GCyRBlocks.MOON_STONE.get()), Set.of(GCyR.id("luna")))); + } + + @Override + public boolean requiresHighTier() { + return true; } @Override diff --git a/common/src/main/java/argent_matter/gcyr/common/data/GCyRCreativeModeTabs.java b/common/src/main/java/argent_matter/gcyr/common/data/GCyRCreativeModeTabs.java index 884642e3..16d6a5a8 100644 --- a/common/src/main/java/argent_matter/gcyr/common/data/GCyRCreativeModeTabs.java +++ b/common/src/main/java/argent_matter/gcyr/common/data/GCyRCreativeModeTabs.java @@ -5,5 +5,5 @@ import com.lowdragmc.lowdraglib.utils.LDLItemGroup; public class GCyRCreativeModeTabs { - public static LDLItemGroup GCYR = new LDLItemGroup(GCyR.MOD_ID, GCyR.MOD_ID, () -> GTItems.FLUID_CELL.asStack()); + public static LDLItemGroup GCYR = new LDLItemGroup(GCyR.MOD_ID, GCyR.MOD_ID, () -> GCyRItems.DYSON_CONSTRUCTION_DRONE.asStack()); } diff --git a/common/src/main/java/argent_matter/gcyr/common/data/GCyRMachines.java b/common/src/main/java/argent_matter/gcyr/common/data/GCyRMachines.java index 9b2adc97..08b32b0a 100644 --- a/common/src/main/java/argent_matter/gcyr/common/data/GCyRMachines.java +++ b/common/src/main/java/argent_matter/gcyr/common/data/GCyRMachines.java @@ -108,7 +108,7 @@ public class GCyRMachines { public static final MachineDefinition SPACE_STATION_PACKAGER = REGISTRATE.multiblock("space_station_packager", SpaceStationPackagerMachine::new) .langValue("Space Station Packager") .rotationState(RotationState.NON_Y_AXIS) - .tier(GTValues.EV) + .tier(GTValues.LuV) .pattern((definition) -> FactoryBlockPattern.start() .aisle(" ", " K ", " K ", " K ", " K ", " K ") .aisle(" BBBBBBB ", " ", " ", " ", " ", " ") @@ -123,7 +123,7 @@ public class GCyRMachines { .where(' ', any()) .build() ) - .shapeInfos(definition -> { + /*.shapeInfos(definition -> { ArrayList shapeInfo = new ArrayList<>(); MultiblockShapeInfo.ShapeInfoBuilder builder = MultiblockShapeInfo.builder() .aisle(" ", " S ", " ", " ", " ", " ") @@ -150,8 +150,8 @@ public class GCyRMachines { .where('G', CASING_TEMPERED_GLASS) .where('C', Blocks.WHITE_CONCRETE).build()); return shapeInfo; - }) - .workableCasingRenderer(GTCEu.id("block/casings/voltage/ev/side"), + })*/ + .workableCasingRenderer(GTCEu.id("block/casings/voltage/luv/side"), GTCEu.id("block/multiblock/assembly_line"), false) .register(); diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 6443328a..024f941e 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -68,5 +68,5 @@ issueTrackerURL="https://github.com/argent-matter/gcyr/issues" modId="gtceu" mandatory=true versionRange="[1.0.13.c,)" - ordering="AFTER" + ordering="BEFORE" side="BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fd1cd1cf..14300f09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -Xss4M mod_id=gcyr mod_name=Gregicality Rocketry -mod_version=0.1.1 +mod_version=0.1.1.a maven_group=argent_matter enabled_platforms = fabric,forge \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index c1f2cd7c..b597e69d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,8 +19,8 @@ dependencyResolutionManagement { // Mod Dependencies Versions // Common def reiVersion = "9.1.619" - def gtCeuVersion = "1.0.13.c" - def ldLibVersion = "1.0.19.d" + def gtCeuVersion = "1.0.14.a" + def ldLibVersion = "1.0.20.a" def kjsVersion = "1902.6.1-build.373" // Fabric