Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to new GT GS and Intergalactical version #702

Open
wants to merge 4 commits into
base: main
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
28 changes: 14 additions & 14 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,30 +34,30 @@
* For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
*/
dependencies {
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.00:dev')
implementation('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.51-gtnh:dev')
// implementation('com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.97-GTNH:dev')
implementation('com.github.GTNewHorizons:GTNH-Intergalactic:1.5.0:dev')
implementation('com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.88:dev')
implementation('com.github.GTNewHorizons:Avaritia:1.56:dev')
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.33:dev')
implementation('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.4-gtnh:dev')
implementation('com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.105-GTNH:dev')
implementation('com.github.GTNewHorizons:GTNH-Intergalactic:1.5.10:dev')
implementation('com.github.GTNewHorizons:NewHorizonsCoreMod:2.7.20:dev')
implementation('com.github.GTNewHorizons:Avaritia:1.57:dev')
implementation('com.github.GTNewHorizons:Avaritiaddons:1.8.4-GTNH:dev')
implementation('com.github.GTNewHorizons:Eternal-Singularity:1.2.1:dev')
implementation('com.github.GTNewHorizons:Universal-Singularities:8.8.0:dev')
// implementation('com.github.GTNewHorizons:BlockRenderer6343:1.2.16:dev')
// implementation('com.github.GTNewHorizons:BlockRenderer6343:1.3.0:dev')
// implementation('com.github.GTNewHorizons:amunra:0.7.1:dev')
implementation('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:dev')
// implementation('com.github.GTNewHorizons:Railcraft:9.15.15:dev')
// implementation('com.github.GTNewHorizons:Railcraft:9.16.0:dev')
implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
implementation('com.github.GTNewHorizons:ThaumicEnergistics:1.6.27-GTNH:dev')
// implementation('com.github.GTNewHorizons:ThaumicBases:1.7.7:dev')
implementation('com.github.GTNewHorizons:ThaumicEnergistics:1.7.0-GTNH:dev')
// implementation('com.github.GTNewHorizons:ThaumicBases:1.8.0:dev')
// implementation('curse.maven:automagy-222153:2285272')
// implementation('com.github.GTNewHorizons:ThaumicHorizons:1.6.5:dev')
// implementation('com.github.GTNewHorizons:Gadomancy:1.3.6:dev')
implementation('com.github.GTNewHorizons:Botania:1.11.6-GTNH:dev')
// implementation('com.github.GTNewHorizons:twilightforest:2.7.0:dev')
implementation('com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev')
// implementation('com.github.GTNewHorizons:twilightforest:2.7.1:dev')
implementation('com.github.GTNewHorizons:supersolarpanels:1.1.3:dev')
implementation('curse.maven:advsolar-362768:2885953')
implementation('com.github.GTNewHorizons:Electro-Magic-Tools:1.5.16:dev')
implementation('com.github.GTNewHorizons:Electro-Magic-Tools:1.6.1:dev')
//These 2 deps have conflicts with Amun-Ra by default, see Twist-Space-Technology-Mod#150
compileOnly('curse.maven:witchery-69673:2234410')
implementation('com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev')
Expand All @@ -71,5 +71,5 @@ dependencies {

// dependencies for mod testing
// using transitive to prevent mod duplication and conflicts
runtimeOnlyNonPublishable("com.github.GTNewHorizons:BlockRenderer6343:1.2.16:dev") { transitive = false }
runtimeOnlyNonPublishable("com.github.GTNewHorizons:BlockRenderer6343:1.3.0:dev") { transitive = false }
}
Original file line number Diff line number Diff line change
Expand Up @@ -322,19 +322,19 @@ public IStructureDefinition<GT_TileEntity_StellarMaterialSiphon> getStructureDef
StructureUtility.ofChain(
GTStructureUtility.ofHatchAdder(
GT_TileEntity_StellarMaterialSiphon::addMaintenanceToMachineList,
IGTextures.ADVANCED_MACHINE_FRAME_INDEX,
IGTextures.CASING_INDEX_SIPHON,
1),
GTStructureUtility.ofHatchAdder(
GT_TileEntity_StellarMaterialSiphon::addExoticEnergyInputToMachineList,
IGTextures.ADVANCED_MACHINE_FRAME_INDEX,
IGTextures.CASING_INDEX_SIPHON,
1),
GTStructureUtility.ofHatchAdder(
GT_TileEntity_StellarMaterialSiphon::addInputToMachineList,
IGTextures.ADVANCED_MACHINE_FRAME_INDEX,
IGTextures.CASING_INDEX_SIPHON,
1),
GTStructureUtility.ofHatchAdder(
GT_TileEntity_StellarMaterialSiphon::addOutputToMachineList,
IGTextures.ADVANCED_MACHINE_FRAME_INDEX,
IGTextures.CASING_INDEX_SIPHON,
1),
StructureUtility.ofBlock(IGBlocks.SpaceElevatorCasing, 0)))// L -> ofBlock...(tile.stone, 0,
// ...);
Expand Down Expand Up @@ -370,19 +370,19 @@ public ChunkCoordIntPair getActiveChunk() {
public ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
int colorIndex, boolean active, boolean redstone) {
if (side == facing) {
if (active) return new ITexture[] {
Textures.BlockIcons.getCasingTextureForId(IGTextures.ADVANCED_MACHINE_FRAME_INDEX),
TextureFactory.of(IGTextures.SIPHON_OVERLAY_FRONT), TextureFactory.builder()
.addIcon(IGTextures.SIPHON_OVERLAY_FRONT_ACTIVE_GLOW)
.glow()
.build() };
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.ADVANCED_MACHINE_FRAME_INDEX),
if (active)
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_SIPHON),
TextureFactory.of(IGTextures.SIPHON_OVERLAY_FRONT), TextureFactory.builder()
.addIcon(IGTextures.SIPHON_OVERLAY_FRONT_ACTIVE_GLOW)
.glow()
.build() };
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_SIPHON),
TextureFactory.of(IGTextures.SIPHON_OVERLAY_FRONT), TextureFactory.builder()
.addIcon(IGTextures.SIPHON_OVERLAY_FRONT_GLOW)
.glow()
.build() };
}
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.ADVANCED_MACHINE_FRAME_INDEX) };
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_SIPHON) };
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
import com.gtnewhorizons.gtnhintergalactic.block.IGBlocks;

import bartworks.API.BorosilicateGlass;
import galaxyspace.core.register.GSBlocks;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.enums.Materials;
Expand Down Expand Up @@ -533,10 +533,10 @@ public IStructureDefinition<TST_BallLightning> getStructureDefinition() {
ne -> ne.fieldGeneratorTier)))
.addElement('G', ofBlock(MetaBlockCasing01, 1))
.addElement('H', ofBlock(ModBlocks.blockCasingsTieredGTPP, 9))
.addElement('I', ofBlock(GSBlocks.DysonSwarmBlocks, 1))
.addElement('J', ofBlock(GSBlocks.DysonSwarmBlocks, 8))
.addElement('K', ofBlock(GSBlocks.DysonSwarmBlocks, 0))
.addElement('L', ofBlock(GSBlocks.DysonSwarmBlocks, 5))
.addElement('I', ofBlock(IGBlocks.DysonSwarmCasing, 1))
.addElement('J', ofBlock(IGBlocks.DysonSwarmCasing, 8))
.addElement('K', ofBlock(IGBlocks.DysonSwarmCasing, 0))
.addElement('L', ofBlock(IGBlocks.DysonSwarmCasing, 5))
.addElement('M', ofBlock(sBlockCasingsTT, 10))
.addElement('N', ofFrame(Materials.SuperconductorUIVBase))
.addElement('O', ofFrame(Materials.Neutronium))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizons.gtnhintergalactic.block.IGBlocks;

import galaxyspace.core.register.GSBlocks;
import gregtech.api.GregTechAPI;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand Down Expand Up @@ -385,7 +384,7 @@ public IStructureDefinition<TST_MiracleDoor> getStructureDefinition() {
.addElement('G', ofBlock(sBlockCasingsTT, 10))
.addElement('H', ofBlock(sBlockCasingsTT, 12))
.addElement('I', ofBlock(sBlockCasingsTT, 14))
.addElement('J', ofBlock(GSBlocks.DysonSwarmBlocks, 9))
.addElement('J', ofBlock(IGBlocks.DysonSwarmCasing, 9))
.addElement('K', ofBlock(BlockQuantumGlass.INSTANCE, 0))
.addElement(
'L',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@

import bartworks.API.BorosilicateGlass;
import bwcrossmod.galacticgreg.VoidMinerUtility;
import galaxyspace.core.register.GSBlocks;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
Expand Down Expand Up @@ -151,7 +150,7 @@ public IStructureDefinition<TST_StarcoreMiner> getStructureDefinition() {
.addElement('G', ofBlock(IGBlocks.SpaceElevatorCasing, 0))
.addElement('H', ofBlock(IGBlocks.SpaceElevatorCasing, 1))
.addElement('I', ofBlock(sBlockCasingsTT, 8))
.addElement('J', ofBlock(GSBlocks.DysonSwarmBlocks, 9))
.addElement('J', ofBlock(IGBlocks.DysonSwarmCasing, 9))
.addElement(
'K',
ofChain(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,19 @@ public IStructureDefinition<TST_MegaUniversalSpaceStation> getStructureDefinitio
StructureUtility.ofChain(
GTStructureUtility.ofHatchAdder(
TST_MegaUniversalSpaceStation::addMaintenanceToMachineList,
IGTextures.ADVANCED_MACHINE_FRAME_INDEX,
IGTextures.CASING_INDEX_SIPHON,
1),
GTStructureUtility.ofHatchAdder(
TST_MegaUniversalSpaceStation::addExoticEnergyInputToMachineList,
IGTextures.ADVANCED_MACHINE_FRAME_INDEX,
IGTextures.CASING_INDEX_SIPHON,
1),
GTStructureUtility.ofHatchAdder(
TST_MegaUniversalSpaceStation::addInputToMachineList,
IGTextures.ADVANCED_MACHINE_FRAME_INDEX,
IGTextures.CASING_INDEX_SIPHON,
1),
GTStructureUtility.ofHatchAdder(
TST_MegaUniversalSpaceStation::addOutputToMachineList,
IGTextures.ADVANCED_MACHINE_FRAME_INDEX,
IGTextures.CASING_INDEX_SIPHON,
1),
StructureUtility.ofBlock(SpaceStationAntiGravityBlock, 13)))
.addElement('D', ofBlock(GregTechAPI.sBlockCasings9, 1))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_DTPF_OFF;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_DTPF_ON;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION1_GLOW;
import static gregtech.api.util.GTStructureUtility.chainAllGlasses;
import static gregtech.api.util.GTStructureUtility.ofFrame;
import static tectech.thing.casing.TTCasingsContainer.sBlockCasingsTT;

Expand All @@ -33,7 +34,6 @@
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.multitileentity.multiblock.casing.Glasses;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.HatchElementBuilder;
Expand Down Expand Up @@ -187,7 +187,7 @@ public IStructureDefinition<MM_LargeNeutronOscillator> getStructureDefinition()
.buildAndChain(GregTechAPI.sBlockCasings8, 10))
.addElement('D', ofBlock(sBlockCasingsTT, 0))
.addElement('E', ofBlock(Loaders.speedingPipe, 0))
.addElement('F', Glasses.chainAllGlasses())
.addElement('F', chainAllGlasses())
.addElement('G', ofFrame(Materials.NaquadahAlloy))
.build();
/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@
import bartworks.common.loaders.ItemRegistry;
import bartworks.system.material.WerkstoffLoader;
import fox.spiteful.avaritia.items.LudicrousItems;
import galaxyspace.core.register.GSItems;
import ggfab.GGItemList;
import goodgenerator.api.recipe.GoodGeneratorRecipeMaps;
import goodgenerator.items.GGMaterial;
Expand Down Expand Up @@ -2285,7 +2284,7 @@ public void loadRecipes() {
Casing_Industrial_Arc_Furnace.get(8),
eM_Power.get(8),
ItemRefer.Advanced_Radiation_Protection_Plate.get(64),
new ItemStack(GSItems.DysonSwarmItems, 64, 3),
new ItemStack(IGItems.DysonSwarmItems, 64, 3),

TransmissionComponent_UV.get(16),
ItemList.Electric_Piston_UHV.get(8),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
import com.gtnewhorizons.gtnhintergalactic.block.IGBlocks;
import com.gtnewhorizons.gtnhintergalactic.recipe.IGRecipeMaps;

import galaxyspace.core.register.GSBlocks;
import goodgenerator.items.GGMaterial;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
Expand Down Expand Up @@ -130,7 +129,7 @@ public void loadRecipes() {

SpaceWarper.get(64),
new ItemStack(IGBlocks.SpaceElevatorCasing, 64),
new ItemStack(GSBlocks.DysonSwarmBlocks, 64, 9))
new ItemStack(IGBlocks.DysonSwarmCasing, 64, 9))
.fluidInputs(
new FluidStack(solderPlasma, 144 * 8192),
Materials.UUMatter.getFluid(1000 * 1024),
Expand Down Expand Up @@ -165,7 +164,7 @@ public void loadRecipes() {
setStackSize(LightWeightPlate.copy(), 64),
eM_Power.get(64),
new ItemStack(IGBlocks.SpaceElevatorCasing, 64),
new ItemStack(GSBlocks.DysonSwarmBlocks, 64, 9))
new ItemStack(IGBlocks.DysonSwarmCasing, 64, 9))
.fluidInputs(
new FluidStack(solderPlasma, 144 * 8192),
Materials.UUMatter.getFluid(1000 * 128),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
import com.google.common.collect.ImmutableList;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizons.gtnhintergalactic.block.IGBlocks;

import galaxyspace.core.register.GSBlocks;
import gregtech.api.GregTechAPI;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand Down Expand Up @@ -510,7 +510,7 @@ public IStructureDefinition<TST_ArtificialStar> getStructureDefinition() {
t -> t.tierStabilisationField)))
.addElement('H', ofBlock(sBlockCasingsTT, 12))
.addElement('I', ofBlock(sBlockCasingsTT, 13))
.addElement('J', ofBlock(GSBlocks.DysonSwarmBlocks, 9))
.addElement('J', ofBlock(IGBlocks.DysonSwarmCasing, 9))
.addElement('K', ofBlock(BlockQuantumGlass.INSTANCE, 0))
.addElement('L',
HatchElementBuilder.<TST_ArtificialStar>builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
import com.gtnewhorizons.gtnhintergalactic.block.IGBlocks;
import com.gtnewhorizons.gtnhintergalactic.tile.multi.elevator.ElevatorUtil;

import galaxyspace.core.register.GSBlocks;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
Expand Down Expand Up @@ -367,7 +366,7 @@ public IStructureDefinition<TST_DSPLauncher> getStructureDefinition() {
TST_DSPLauncher::setMotorTier,
TST_DSPLauncher::getMotorTier))
.addElement('F', ofBlock(sBlockCasingsTT, 0))// F -> ofBlock...(gt.blockcasingsTT, 0, ...);
.addElement('G', ofBlock(GSBlocks.DysonSwarmBlocks, 9))// G -> ofBlock...(tile.DysonSwarmPart, 9, ...);
.addElement('G', ofBlock(IGBlocks.DysonSwarmCasing, 9))// G -> ofBlock...(tile.DysonSwarmPart, 9, ...);
.addElement(
'H',
HatchElementBuilder.<TST_DSPLauncher>builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizons.gtnhintergalactic.block.IGBlocks;

import galaxyspace.core.register.GSBlocks;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
Expand Down Expand Up @@ -509,8 +508,8 @@ public IStructureDefinition<TST_DSPReceiver> getStructureDefinition() {
.addElement('J', ofBlock(sBlockCasingsTT, 7)) // J -> ofBlock...(gt.blockcasingsTT, 7, ...);
.addElement('K', ofBlock(sBlockCasingsTT, 9)) // K -> ofBlock...(gt.blockcasingsTT, 9, ...);
.addElement('L', ofBlock(ModBlocks.blockCasings4Misc, 4)) // L -> ofBlock...(gtplusplus.blockcasings.4, 4, ...);
.addElement('M', ofBlock(GSBlocks.DysonSwarmBlocks, 1)) // M -> ofBlock...(tile.DysonSwarmPart, 1, ...);
.addElement('N', ofBlock(GSBlocks.DysonSwarmBlocks, 9)) // N -> ofBlock...(tile.DysonSwarmPart, 9, ...);
.addElement('M', ofBlock(IGBlocks.DysonSwarmCasing, 1)) // M -> ofBlock...(tile.DysonSwarmPart, 1, ...);
.addElement('N', ofBlock(IGBlocks.DysonSwarmCasing, 9)) // N -> ofBlock...(tile.DysonSwarmPart, 9, ...);
.addElement('O', ofBlock(BlockQuantumGlass.INSTANCE, 0)) // O -> ofBlock...(tile.quantumGlass, 0, ...);
.addElement(
'P',
Expand Down
Loading