Skip to content

Commit

Permalink
Merge branch 'master' into foil
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Jan 9, 2025
2 parents 5ff6462 + 08f28d5 commit d81f51e
Show file tree
Hide file tree
Showing 183 changed files with 2,856 additions and 1,387 deletions.
64 changes: 32 additions & 32 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@
* 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:StructureLib:1.4.0:dev")
api("com.github.GTNewHorizons:StructureLib:1.4.2:dev")
api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.13-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
api("com.github.GTNewHorizons:GTNHLib:0.6.0:dev")
api("com.github.GTNewHorizons:ModularUI:1.2.17:dev")
api("com.github.GTNewHorizons:ModularUI2:2.1.16-1.7.10:dev")
api("com.github.GTNewHorizons:ModularUI2:2.2.0-1.7.10:dev")
api("com.github.GTNewHorizons:waila:1.8.2:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-507-GTNH:dev")
api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.2-gtnh:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-518-GTNH:dev")
api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.14-gtnh:dev")
api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
api("com.github.GTNewHorizons:Postea:1.0.13:dev")

compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.11.0:dev')
compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.11.1:dev')
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.15:dev")
implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
Expand All @@ -56,57 +56,57 @@ dependencies {

devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.10.0-GTNH:dev")

compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.57:dev")
compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.59:dev")

compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta27:api') { transitive = false }
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta28:api') { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.4:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.9.0:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.10.0:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.15:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.42:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.9.2:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.11.0-GTNH:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.16.1:dev") { transitive = false }

compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false}
compileOnly("com.github.GTNewHorizons:ThaumicBases:1.8.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ThaumicBases:1.8.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.28:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.104-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.106-GTNH:dev") { transitive = false }

compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.8-GTNH:dev") { transitive = false }
implementation("com.github.GTNewHorizons:TinkersConstruct:1.13.0-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.3.1-GTNH:dev") { transitive = false }
implementation("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev")

compileOnly("com.github.GTNewHorizons:Chisel:2.16.0-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Chisel:2.16.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Translocators:1.3.0:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.6:dev")
compileOnly('com.github.GTNewHorizons:Botania:1.12.2-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.13-GTNH:dev') { transitive = false }
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.13:dev")
compileOnly('com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:HoloInventory:2.5.0-GTNH:dev') { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
compileOnly("com.github.GTNewHorizons:OpenComputers:1.11.1-GTNH:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:OpenComputers:1.11.2-GTNH:dev") {transitive = false}
// https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.0-GTNH:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.9:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.2-GTNH:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")

compileOnly('com.github.GTNewHorizons:SC2:2.2.0:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:Binnie:2.5.0:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:SC2:2.3.0:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:Binnie:2.5.2:dev') {transitive = false}
compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
devOnlyNonPublishable('com.github.GTNewHorizons:BlockRenderer6343:1.2.16:dev'){transitive=false}
devOnlyNonPublishable('com.github.GTNewHorizons:BlockRenderer6343:1.3.0:dev'){transitive=false}

compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
annotationProcessor("com.google.auto.value:auto-value:1.10.1")

// For testing forestry integration (iApiary, combs, tree growth simulator)
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.10.0:dev")
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.10.1:dev")
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.5.0:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.9.0-GTNH:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.5.2:dev')

testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
Expand All @@ -119,7 +119,7 @@ dependencies {
functionalTestImplementation('org.junit.platform:junit-platform-reporting')

runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.9.0:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.9.2:dev')

// For testing
//runtimeOnlyNonPublishable('com.github.GTNewHorizons:TCNEIAdditions:1.4.2:dev')
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/bartworks/API/GlassTier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ public static void addCustomGlass(String modname, String unlocalisedBlockName, i

public static void addCustomGlass(@NotNull Block block, int meta, int tier) {
Objects.requireNonNull(block, "Glass block cannot be null");
GlassTier.glasses.put(new BlockMetaPair(block, (byte) meta), tier);
GlassTier.glasses.put(new BlockMetaPair(block, meta), tier);
}

public static HashMap<BlockMetaPair, Integer> getGlassMap() {
return glasses;
}

public static int getGlassTier(Block block, int meta) {
return glasses.getOrDefault(new BlockMetaPair(block, (byte) meta), 0);
return glasses.getOrDefault(new BlockMetaPair(block, meta), 0);
}

public static class BlockMetaPair {
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/bartworks/common/loaders/recipes/Assembler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,17 @@ public void run() {
.eut(TierEU.RECIPE_MV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.MACHINE_HULLS[3].get(1),
ItemList.Electric_Pump_HV.get(2),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4),
GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2))
.itemOutputs(ItemList.Distillation_Tower.get(1))
.duration(10 * SECONDS)
.eut(30)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hatch_Input_HV.get(64),
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/bartworks/common/loaders/recipes/AssemblyLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public void run() {
WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 8))
.fluidInputs(new FluidStack(solderIndalloy, 1440))
.itemOutputs(ItemRegistry.cal.copy())
.eut(TierEU.RECIPE_LuV)
.duration(20 * MINUTES)
.eut(TierEU.RECIPE_ZPM)
.duration(60 * SECONDS)
.addTo(AssemblyLine);
}
}
2 changes: 1 addition & 1 deletion src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ public boolean supportsBatchMode() {

@Override
public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
float aX, float aY, float aZ) {
float aX, float aY, float aZ, ItemStack aTool) {
if (aPlayer.isSneaking()) {
batchMode = !batchMode;
if (batchMode) {
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,23 +588,22 @@ protected boolean supportsSlotAutomation(int aSlot) {

@Override
public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
float aX, float aY, float aZ) {
float aX, float aY, float aZ, ItemStack aTool) {
if (!aPlayer.isSneaking()) {
if (mode == 0) return false;
inputSeparation = !inputSeparation;
GTUtility.sendChatToPlayer(
aPlayer,
StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation);
return true;
} else {
batchMode = !batchMode;
if (batchMode) {
GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn"));
} else {
GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff"));
}
return true;
}
return true;
}

@Override
Expand Down
39 changes: 17 additions & 22 deletions src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;

import com.google.common.collect.ImmutableList;
import com.gtnewhorizon.structurelib.StructureLibAPI;
import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
Expand Down Expand Up @@ -89,6 +90,7 @@
import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.api.util.OverclockCalculator;
import gregtech.api.util.shutdown.ShutDownReason;

public class MTEElectricImplosionCompressor extends MTEExtendedPowerMultiBlockBase<MTEElectricImplosionCompressor>
implements ISurvivalConstructable {
Expand Down Expand Up @@ -198,21 +200,15 @@ public PlaceResult survivalPlaceBlock(MTEElectricImplosionCompressor t, World wo
.build();

public static List<Pair<Block, Integer>> getAllBlockTiers() {
return new ArrayList<>() {

private static final long serialVersionUID = 8171991663102417651L;

{
this.add(Pair.of(GregTechAPI.sBlockMetal5, 2));
if (Mods.Avaritia.isModLoaded()) {
this.add(Pair.of(LudicrousBlocks.resource_block, 1));
}
this.add(Pair.of(GregTechAPI.sBlockMetal9, 4));
this.add(Pair.of(GregTechAPI.sBlockMetal9, 3));
this.add(Pair.of(GregTechAPI.sBlockMetal9, 8));
}

};
ImmutableList.Builder<Pair<Block, Integer>> b = new ImmutableList.Builder<>();
b.add(Pair.of(GregTechAPI.sBlockMetal5, 2));
if (Mods.Avaritia.isModLoaded()) {
b.add(Pair.of(LudicrousBlocks.resource_block, 1));
}
b.add(Pair.of(GregTechAPI.sBlockMetal9, 4));
b.add(Pair.of(GregTechAPI.sBlockMetal9, 3));
b.add(Pair.of(GregTechAPI.sBlockMetal9, 8));
return b.build();
}

public static ITierConverter<Integer> tieredBlockConverter() {
Expand Down Expand Up @@ -374,9 +370,9 @@ public boolean isCorrectMachinePart(ItemStack itemStack) {
}

@Override
public void stopMachine() {
public void stopMachine(@NotNull ShutDownReason reason) {
this.resetPiston(this.mBlockTier);
super.stopMachine();
super.stopMachine(reason);
}

private void resetPiston(int tier) {
Expand Down Expand Up @@ -427,13 +423,12 @@ private void animatePiston(IGregTechTileEntity aBaseMetaTileEntity) {
aBaseMetaTileEntity.getWorld(),
this.chunkCoordinates.get(2).posX,
this.chunkCoordinates.get(2).posY,
this.chunkCoordinates.get(2).posZ,
10);
this.chunkCoordinates.get(2).posZ);
}

@SideOnly(Side.CLIENT)
private void spawnVisualPistonBlocks(World world, int x, int y, int z, int age) {
EICPistonVisualizer pistonVisualizer = new EICPistonVisualizer(world, x, y, z, age);
private void spawnVisualPistonBlocks(World world, int x, int y, int z) {
EICPistonVisualizer pistonVisualizer = new EICPistonVisualizer(world, x, y, z, 10);
Minecraft.getMinecraft().effectRenderer.addEffect(pistonVisualizer);
}

Expand Down Expand Up @@ -536,7 +531,7 @@ public boolean supportsBatchMode() {

@Override
public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
float aX, float aY, float aZ) {
float aX, float aY, float aZ, ItemStack aTool) {
if (aPlayer.isSneaking()) {
batchMode = !batchMode;
if (batchMode) {
Expand Down
24 changes: 15 additions & 9 deletions src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;

import org.jetbrains.annotations.NotNull;

import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
Expand All @@ -51,10 +53,14 @@
import gregtech.api.metatileentity.implementations.MTEHatchInput;
import gregtech.api.metatileentity.implementations.MTEHatchOutputBus;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.check.CheckRecipeResult;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTLanguageManager;
import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gregtech.api.util.shutdown.SimpleShutDownReason;

public class MTEHighTempGasCooledReactor extends MTEEnhancedMultiBlockBase<MTEHighTempGasCooledReactor> {

Expand Down Expand Up @@ -257,23 +263,23 @@ protected boolean filtersFluid() {
}

@Override
public boolean checkRecipe(ItemStack controllerStack) {
public @NotNull CheckRecipeResult checkProcessing() {

if (this.empty) {
if (this.HeliumSupply > 0 || this.fuelsupply > 0) {
this.mEfficiency = 10000;
this.mMaxProgresstime = 100;
return true;
return CheckRecipeResultRegistry.SUCCESSFUL;
}
return false;
return CheckRecipeResultRegistry.NO_RECIPE;
}
if (this.HeliumSupply < MTEHighTempGasCooledReactor.HELIUM_NEEDED || this.fuelsupply < mincapacity)
return false;
return CheckRecipeResultRegistry.NO_RECIPE;

double eff = Math.min(Math.pow((double) this.fuelsupply / (double) mincapacity, 2D), 100D) / 100D
- (this.getIdealStatus() - this.getRepairStatus()) / 10D;

if (eff <= 0) return false;
if (eff <= 0) return CheckRecipeResultRegistry.NO_RECIPE;

int toReduce = MathUtils.floorInt(this.fuelsupply * 0.025D * eff);

Expand All @@ -285,7 +291,7 @@ public boolean checkRecipe(ItemStack controllerStack) {

ItemStack[] toOutput = { new ItemStack(HTGRMaterials.aHTGR_Materials, burnedballs, meta),
new ItemStack(HTGRMaterials.aHTGR_Materials, toReduce, meta + 1) };
if (!this.canOutputAll(toOutput)) return false;
if (!this.canOutputAll(toOutput)) return CheckRecipeResultRegistry.NO_RECIPE;

this.fuelsupply -= originalToReduce;
this.mOutputItems = toOutput;
Expand All @@ -298,7 +304,7 @@ public boolean checkRecipe(ItemStack controllerStack) {
this.mEfficiencyIncrease = 0;
this.mEUt = -powerUsage;
this.mMaxProgresstime = (int) (72000 * (1d - eff / 2d));
return true;
return CheckRecipeResultRegistry.SUCCESSFUL;
}

private int runningtick = 0;
Expand Down Expand Up @@ -344,7 +350,7 @@ public boolean onRunningTick(ItemStack aStack) {
}
// USE DA POWAH
if (!this.drainEnergyInput(-this.mEUt)) {
this.criticalStopMachine();
this.stopMachine(ShutDownReasonRegistry.POWER_LOSS);
return false;
}

Expand All @@ -366,7 +372,7 @@ public boolean onRunningTick(ItemStack aStack) {

this.updateSlots();

if (takecoolant > 0) this.stopMachine();
if (takecoolant > 0) this.stopMachine(SimpleShutDownReason.ofNormal("no_coolant"));
}

return true;
Expand Down
Loading

0 comments on commit d81f51e

Please sign in to comment.