Skip to content

Commit

Permalink
Merge branch 'master' into trans
Browse files Browse the repository at this point in the history
  • Loading branch information
@serenibyss
serenibyss authored Dec 15, 2024
2 parents 15c4dae + 0bb99d6 commit ff416ea
Show file tree
Hide file tree
Showing 31 changed files with 364 additions and 338 deletions.
24 changes: 12 additions & 12 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.70:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.07:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

implementation("com.github.GTNewHorizons:GTNHLib:0.5.20:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.5.22:dev")

compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.25:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.9:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.56:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.14-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.16-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
compileOnly("com.github.GTNewHorizons:Chisel:2.15.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.7:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.12.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.9:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.7.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.17:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.8-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.19:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.7-GTNH:dev")

runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 1 addition & 0 deletions repositories.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Add any additional repositories for your dependencies here

repositories {
mavenLocal()
ivy {
url 'https://files.vexatos.com/'
patternLayout {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
}


4 changes: 1 addition & 3 deletions src/main/java/com/dreammaster/detrav/ScannerTools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@

public class ScannerTools implements IOreRecipeRegistrator {

public ScannerTools() {
OrePrefixes.toolHeadPickaxe.add(this);
}
public ScannerTools() {}

public void registerOre(OrePrefixes o, Materials material, String s, String s2, ItemStack i) {
GTModHandler.addCraftingRecipe(
Expand Down
64 changes: 27 additions & 37 deletions src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,14 +746,6 @@ public void run() {
GGMaterial.incoloy903.get(OrePrefixes.pipeSmall), 'F',
OrePrefixes.gearGt.get(Materials.Titanium) });

// Neutronium Stabilization Casing
GTModHandler.addCraftingRecipe(
ItemList.Neutronium_Stable_Casing.get(4),
bits,
new Object[] { "PQP", "QFQ", "PQP", 'P',
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), 'Q',
ItemList.Field_Generator_ZPM.get(1), 'F', ItemList.Casing_MAX.get(1) });

// Industrial Precision Lathe
GTModHandler.addCraftingRecipe(
ItemList.Machine_Multi_Lathe.get(1),
Expand Down Expand Up @@ -1061,11 +1053,6 @@ public void run() {
GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE,
new Object[] { " h ", "SSS", "SSS", 'S',
GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1) });
GTModHandler.addCraftingRecipe(
GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Steel, 1L),
GTProxy.tBits,
new Object[] { "PIh", "f ", 'P', OrePrefixes.plate.get(Materials.Steel), 'I',
OrePrefixes.ingot.get(Materials.Steel) });

GTModHandler.addShapelessCraftingRecipe(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
Expand Down Expand Up @@ -1124,14 +1111,6 @@ public void run() {
GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E',
GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'C',
OrePrefixes.cableGt01.get(Materials.Tin), 'S', screw.get(Materials.Steel) });
GTModHandler.addCraftingRecipe(
GTModHandler.getModItem(IndustrialCraft2.ID, "itemToolHoe", 1, GTValues.W),
bits,
new Object[] { "dPH", "PGB", "ECS", 'S', screw.get(Materials.Steel), 'H',
OrePrefixes.toolHeadHoe.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel),
'B', GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E',
GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'P',
OrePrefixes.plate.get(Materials.Steel) });

if (OpenComputers.isModLoaded()) GTModHandler.addCraftingRecipe(
GTModHandler.getModItem(OpenComputers.ID, "wrench", 1, 0),
Expand Down Expand Up @@ -2119,24 +2098,14 @@ public void run() {

for (int i = 0; i <= 7; i++) {
ItemStack modifiedHatch = ItemList.Hatch_Output_ME.get(1L);
NBTTagCompound hatchNBT = modifiedHatch.getTagCompound();
if (hatchNBT != null) {
hatchNBT.setLong("baseCapacity", capacities[i]);
} else {
hatchNBT = new NBTTagCompound();
hatchNBT.setLong("baseCapacity", capacities[i] * 256);
modifiedHatch.setTagCompound(hatchNBT);
}
NBTTagCompound hatchNBT = new NBTTagCompound();
hatchNBT.setLong("baseCapacity", capacities[i] * 256);
modifiedHatch.setTagCompound(hatchNBT);

ItemStack modifiedBus = ItemList.Hatch_Output_Bus_ME.get(1L);
NBTTagCompound busNBT = modifiedBus.getTagCompound();
if (busNBT != null) {
busNBT.setLong("baseCapacity", capacities[i]);
} else {
busNBT = new NBTTagCompound();
busNBT.setLong("baseCapacity", capacities[i]);
modifiedBus.setTagCompound(busNBT);
}
NBTTagCompound busNBT = new NBTTagCompound();
busNBT.setLong("baseCapacity", capacities[i]);
modifiedBus.setTagCompound(busNBT);

GTModHandler.addShapelessCraftingRecipe(
modifiedHatch,
Expand All @@ -2145,6 +2114,27 @@ public void run() {
modifiedBus,
new Object[] { ItemList.Hatch_Output_Bus_ME.get(1L), itemComponents[i] });
}
final ItemStack SINGULARITY = GTModHandler
.getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1);
final ItemStack FLUID_SINGULARITY = GTModHandler
.getModItem(AE2FluidCraft.ID, "fluid_storage.singularity", 1, 0);

ItemStack modifiedHatch = ItemList.Hatch_Output_ME.get(1L);
NBTTagCompound hatchNBT = new NBTTagCompound();
hatchNBT.setLong("baseCapacity", Long.MAX_VALUE);
modifiedHatch.setTagCompound(hatchNBT);

ItemStack modifiedBus = ItemList.Hatch_Output_Bus_ME.get(1L);
NBTTagCompound busNBT = new NBTTagCompound();
busNBT.setLong("baseCapacity", Long.MAX_VALUE);
modifiedBus.setTagCompound(busNBT);

GTModHandler.addShapelessCraftingRecipe(
modifiedBus,
new Object[] { ItemList.Hatch_Output_Bus_ME.get(1L), SINGULARITY });
GTModHandler.addShapelessCraftingRecipe(
modifiedHatch,
new Object[] { ItemList.Hatch_Output_ME.get(1L), FLUID_SINGULARITY });

// Pre-add planet block to EOH controller
for (String dimAbbreviation : DimensionHelper.DimNameDisplayed) {
Expand Down
36 changes: 18 additions & 18 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Wires.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@ public void run() {

private void registerWires() {

// ID Range: 1200 - 4100
// Free IDs: 2030 - 4100
// Take a look in gt5u MetaTileEntityIDs for free spaces

// ===================================================================================================
// Make wires
// ===================================================================================================

// Takes 20!!! slots per wire
makeWires(Materials.ElectricalSteel, 11490, 1L, 2L, 2L, GTValues.V[2], true, false);
makeWires(Materials.EnergeticAlloy, 11510, 2L, 4L, 2L, gregtech.api.enums.GTValues.V[3], true, false);
makeWires(Materials.VibrantAlloy, 11530, 2L, 4L, 4L, gregtech.api.enums.GTValues.V[4], true, false);
makeWires(Materials.MelodicAlloy, 11550, 2L, 4L, 4L, gregtech.api.enums.GTValues.V[5], true, false);
makeWires(Materials.StellarAlloy, 11570, 4L, 8L, 6L, gregtech.api.enums.GTValues.V[6], true, false);
makeWires(Materials.Trinium, 11450, 4L, 8L, 6L, GTValues.V[7], true, false);
makeWires(Materials.ElectrumFlux, 1900, 1L, 2L, 3L, GTValues.V[8], true, false);
makeWires(Materials.Bedrockium, 11310, 1L, 32L, 2L, GTValues.V[9], true, false);
makeWires(Materials.Osmiridium, 11610, 1L, 2L, 8L, GTValues.V[6], true, false);
makeWires(Materials.HSSE, 11590, 2L, 4L, 6L, GTValues.V[6], true, false);
makeWires(Materials.HSSS, 11470, 4L, 8L, 6L, GTValues.V[9], true, false);
makeWires(Materials.Draconium, 11330, 4L, 32L, 8L, GTValues.V[10], true, false);
makeWires(Materials.NetherStar, 11350, 4L, 16L, 4L, GTValues.V[11], true, false);
makeWires(Materials.Quantium, 11370, 4L, 16L, 2L, GTValues.V[12], true, false);
makeWires(Materials.BlackPlutonium, 11390, 4L, 16L, 1L, GTValues.V[13], false, false);
makeWires(Materials.DraconiumAwakened, 11410, 4L, 16L, 1L, GTValues.V[14], false, false);
makeWires(Materials.ElectricalSteel, 11490, 1L, 2L, 3L, GTValues.V[2], true, false);
makeWires(Materials.EnergeticAlloy, 11510, 1L, 2L, 4L, gregtech.api.enums.GTValues.V[3], true, false);
makeWires(Materials.VibrantAlloy, 11530, 3L, 6L, 6L, gregtech.api.enums.GTValues.V[4], true, false);
makeWires(Materials.EndSteel, 1860, 3L, 6L, 6L, gregtech.api.enums.GTValues.V[5], true, false);
makeWires(Materials.MelodicAlloy, 11550, 2L, 4L, 4L, gregtech.api.enums.GTValues.V[6], true, false);
makeWires(Materials.StellarAlloy, 11570, 12L, 24L, 12L, gregtech.api.enums.GTValues.V[8], true, false);
makeWires(Materials.Trinium, 11450, 3L, 6L, 6L, GTValues.V[7], true, false);
makeWires(Materials.ElectrumFlux, 1900, 3L, 2L, 6L, GTValues.V[8], true, false);
makeWires(Materials.Bedrockium, 11310, 6L, 48L, 3L, GTValues.V[9], true, false);
makeWires(Materials.Osmiridium, 11610, 1L, 2L, 16L, GTValues.V[7], true, false);
makeWires(Materials.HSSE, 11590, 4L, 8L, 6L, GTValues.V[6], true, false);
makeWires(Materials.HSSS, 11470, 4L, 8L, 8L, GTValues.V[9], true, false);
makeWires(Materials.Draconium, 11330, 32L, 64L, 8L, GTValues.V[10], true, false);
makeWires(Materials.NetherStar, 11350, 16L, 32L, 4L, GTValues.V[11], true, false);
makeWires(Materials.Quantium, 11370, 32L, 128L, 4L, GTValues.V[12], true, false);
makeWires(Materials.BlackPlutonium, 11390, 8L, 8L, 8L, GTValues.V[13], false, false);
makeWires(Materials.DraconiumAwakened, 11410, 64L, 64L, 8L, GTValues.V[14], false, false);
makeWires(Materials.Infinity, 11430, 0L, 0L, 8192L, GTValues.V[14], false, true);

/**
Expand Down
97 changes: 0 additions & 97 deletions src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,13 @@

import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;

import com.dreammaster.gthandler.CustomItemList;
import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT1;
import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT2;
import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT3;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.objects.GTCopiedBlockTexture;
import gregtech.api.util.GTLanguageManager;
import gregtech.common.blocks.BlockCasingsAbstract;
Expand Down Expand Up @@ -95,95 +87,6 @@ public IIcon getIcon(int aSide, int aMeta) {
}
}

private IIcon getTurbineCasing(int meta, int iconIndex, boolean active) {
switch (meta) {
case 3:
return active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon()
: Textures.BlockIcons.TURBINE2[iconIndex].getIcon();
case 5:
return active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon()
: Textures.BlockIcons.TURBINE3[iconIndex].getIcon();
default: // 0 or undefined turbine meta casing
return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon()
: Textures.BlockIcons.TURBINE[iconIndex].getIcon();
}
}

public boolean isTurbineMeta(int tMeta) {
return tMeta == 0 || tMeta == 3 || tMeta == 5;
}

@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) {
int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
if (!isTurbineMeta(tMeta) && tMeta < 9 || tMeta == 15) {
return getIcon(ordinalSide, tMeta);
}
if (!isTurbineMeta(tMeta) || !mConnectedMachineTextures) {
return getIcon(ordinalSide, tMeta);
}
if (ordinalSide == 1) {
TileEntity tTileEntity;
IMetaTileEntity tMetaTileEntity;

for (int xi = -2; xi <= 2; xi++) {
for (int zi = -2; zi <= 2; zi++) {
if (null != (tTileEntity = aWorld.getTileEntity(xCoord + xi, Math.max(yCoord - 3, 0), zCoord + zi))
&& tTileEntity instanceof IGregTechTileEntity
&& null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())
&& (tMetaTileEntity instanceof GT_MetaTileEntity_AirFilterT1
|| tMetaTileEntity instanceof GT_MetaTileEntity_AirFilterT2
|| tMetaTileEntity instanceof GT_MetaTileEntity_AirFilterT3)) {
boolean active = false;
if (((IGregTechTileEntity) tTileEntity).isActive()) {
active = true;
}
// check for direction and placement and apply the texture
switch (((IGregTechTileEntity) tTileEntity).getFrontFacing()) {
case NORTH:
if (xi < 2 && xi > -2 && zi < 1) { // if invalid position ignore (aka too far away)
try {
return getTurbineCasing(tMeta, -xi + 1 - zi * 3, active);
} catch (Exception e) {
return getIcon(ordinalSide, tMeta);
}
}
break;
case SOUTH:
if (xi < 2 && xi > -2 && zi > -1) {
try {
return getTurbineCasing(tMeta, -xi + 1 + (2 - zi) * 3, active);
} catch (Exception e) {
return getIcon(ordinalSide, tMeta);
}
}
break;
case WEST:
if (zi < 2 && zi > -2 && xi < 1) {
try {
return getTurbineCasing(tMeta, -xi + (1 - zi) * 3, active);
} catch (Exception e) {
return getIcon(ordinalSide, tMeta);
}
}
break;
case EAST:
if (zi < 2 && zi > -2 && xi > -1) {
try {
return getTurbineCasing(tMeta, -xi + 2 + (1 - zi) * 3, active);
} catch (Exception e) {
return getIcon(ordinalSide, tMeta);
}
}
}
}
}
}
}
return getIcon(ordinalSide, tMeta);
}

@Override
public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) {
return aWorld.getBlockMetadata(aX, aY, aZ) <= 9 ? super.colorMultiplier(aWorld, aX, aY, aZ)
Expand Down
Loading

0 comments on commit ff416ea

Please sign in to comment.