Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/cribs_super_recipe_check' into c…
Browse files Browse the repository at this point in the history 
…ribs_super_recipe_check
  • Loading branch information
@lordIcocain
lordIcocain committed Dec 14, 2024
2 parents ad5a450 + 12e9d76 commit 4560720
Show file tree
Hide file tree
Showing 263 changed files with 667 additions and 2,629 deletions.
6 changes: 3 additions & 3 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {
compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.7: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.97-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.100-GTNH:dev") { transitive = false }

compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.8-GTNH:dev") { transitive = false }
implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.16-GTNH:dev")
Expand All @@ -80,8 +80,8 @@ dependencies {
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.5.82:dev")
compileOnly('com.github.GTNewHorizons:Botania:1.11.6-GTNH:dev') { transitive = false }
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.0:dev")
compileOnly('com.github.GTNewHorizons:Botania:1.12.1-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.13-GTNH:dev') { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
Expand Down
39 changes: 0 additions & 39 deletions src/main/java/bartworks/common/commands/ClearCraftingCache.java
View file

This file was deleted.

37 changes: 0 additions & 37 deletions src/main/java/bartworks/common/commands/GetWorkingDirectory.java
View file

This file was deleted.

2 changes: 2 additions & 0 deletions src/main/java/bartworks/common/loaders/ItemRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,9 @@ public class ItemRegistry {
public static ItemStack giantOutputHatch;
public static ItemStack humongousInputHatch;

@Deprecated
public static ItemStack[][][] TecTechLaserAdditions = new ItemStack[3][4][4];
@Deprecated
public static ItemStack TecTechPipeEnergyLowPower;

public static void run() {
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/bartworks/common/loaders/RegisterServerCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

package bartworks.common.loaders;

import bartworks.common.commands.ClearCraftingCache;
import bartworks.common.commands.GetWorkingDirectory;
import bartworks.common.commands.PrintRecipeListToFile;
import bartworks.common.commands.SummonRuin;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
Expand All @@ -24,7 +22,5 @@ public class RegisterServerCommands {
public static void registerAll(FMLServerStartingEvent event) {
event.registerServerCommand(new SummonRuin());
event.registerServerCommand(new PrintRecipeListToFile());
event.registerServerCommand(new ClearCraftingCache());
event.registerServerCommand(new GetWorkingDirectory());
}
}
106 changes: 0 additions & 106 deletions src/main/java/bartworks/common/loaders/recipes/Assembler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import net.minecraftforge.fluids.FluidRegistry;

import bartworks.common.loaders.ItemRegistry;
import bartworks.system.material.WerkstoffLoader;
import goodgenerator.items.GGMaterial;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.GTValues;
Expand All @@ -24,19 +23,6 @@ public class Assembler implements Runnable {

@Override
public void run() {
Materials[] cables = { // Cable material used in the acid gen, diode and energy distributor below
Materials.Lead, // ULV
Materials.Tin, // LV
Materials.AnnealedCopper, // MV
Materials.Gold, // HV
Materials.Aluminium, // EV
Materials.Tungsten, // IV
Materials.VanadiumGallium, // LuV
Materials.Naquadah, // ZPM
Materials.NaquadahAlloy, // UV
Materials.SuperconductorUV // UHV
};

GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0),
Expand Down Expand Up @@ -134,98 +120,6 @@ public void run() {
.eut(TierEU.RECIPE_MV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Parts_GlassFiber.get(32),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 8),
WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2))
.itemOutputs(
new ItemStack(
ItemRegistry.TecTechPipeEnergyLowPower.getItem(),
1,
ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()))
.fluidInputs(Materials.Polytetrafluoroethylene.getMolten(72))
.duration(10 * SECONDS)
.eut(TierEU.RECIPE_EV)
.addTo(assemblerRecipes);

ItemStack[][] converters = ItemRegistry.TecTechLaserAdditions[0];
ItemStack[][] input = ItemRegistry.TecTechLaserAdditions[1];
ItemStack[][] dynamo = ItemRegistry.TecTechLaserAdditions[2];

ItemList[] emitters = { ItemList.Emitter_EV, ItemList.Emitter_IV, ItemList.Emitter_LuV, ItemList.Emitter_ZPM };

ItemList[] sensors = { ItemList.Sensor_EV, ItemList.Sensor_IV, ItemList.Sensor_LuV, ItemList.Sensor_ZPM };

OrePrefixes[] prefixes = { OrePrefixes.cableGt04, OrePrefixes.cableGt08, OrePrefixes.cableGt12,
OrePrefixes.cableGt16 };

for (int j = 0; j < 4; j++) {
for (int i = 0; i < 4; i++) {
ItemStack converter = converters[j][i];
ItemStack eInput = input[j][i];
ItemStack eDynamo = dynamo[j][i];
long recipeConsumption = switch (i) {
case 0 -> TierEU.RECIPE_EV;
case 1 -> TierEU.RECIPE_IV;
case 2 -> TierEU.RECIPE_LuV;
case 3 -> TierEU.RECIPE_ZPM;
default -> TierEU.RECIPE_EV;
};

int solderingAmount = Math.max(144 * i, 72) * (j + 1);

GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(
ItemRegistry.TecTechPipeEnergyLowPower.getItem(),
((j + 1) * 16),
ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()),
WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens),
GTOreDictUnificator.get(prefixes[j], cables[i + 4], 8),
emitters[i].get(2 * (j + 1)),
sensors[i].get(2 * (j + 1)),
ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1)))
.itemOutputs(converter)
.fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount))
.duration((10 * (j + 1)) * SECONDS)
.eut(recipeConsumption)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(
ItemRegistry.TecTechPipeEnergyLowPower.getItem(),
(j + 1) * 16,
ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()),
WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens),
GTOreDictUnificator.get(prefixes[j], cables[i + 4], 8),
sensors[i].get(2 * (j + 1)),
ItemList.HATCHES_ENERGY[4 + i].get(2 * (j + 1)))
.itemOutputs(eInput)
.fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount))
.duration((10 * (j + 1)) * SECONDS)
.eut(recipeConsumption)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(
ItemRegistry.TecTechPipeEnergyLowPower.getItem(),
(j + 1) * 16,
ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()),
WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens),
GTOreDictUnificator.get(prefixes[j], cables[i + 4], 8),
emitters[i].get(2 * (j + 1)),
ItemList.HATCHES_DYNAMO[4 + i].get(2 * (j + 1)))
.itemOutputs(eDynamo)
.fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount))
.duration((10 * (j + 1) * SECONDS))
.eut(recipeConsumption)
.addTo(assemblerRecipes);
}
}

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hatch_Input_HV.get(64),
Expand Down
49 changes: 49 additions & 0 deletions src/main/java/bartworks/system/material/WerkstoffLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1570,6 +1570,55 @@ public static void setUp() {
104,
TextureSet.SET_SHINY);

// Extracted from GalaxySpace
public static final Werkstoff LiquidHelium = new Werkstoff(
new short[] { 210, 230, 250 },
"Liquid Helium",
"He",
new Werkstoff.Stats().setBoilingPoint(4)
.setGas(false)
.setMeltingPoint(1),
Werkstoff.Types.MATERIAL,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
11500,
TextureSet.SET_FLUID);

public static final Werkstoff HafniumCarbide = new Werkstoff(
new short[] { 125, 135, 125 },
"Hafnium Carbide",
"HfC",
new Werkstoff.Stats().setMass(192),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
11501,
TextureSet.SET_METALLIC);

public static final Werkstoff TantalumCarbideHafniumCarbideMixture = new Werkstoff(
new short[] { 75, 85, 75 },
"Tantalum Carbide / Hafnium Carbide Mixture",
subscriptNumbers("(TaC)4HfC"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
11502,
TextureSet.SET_METALLIC);

public static final Werkstoff TantalumHafniumCarbide = new Werkstoff(
new short[] { 80, 90, 80 },
"Tantalum Hafnium Carbide",
subscriptNumbers("Ta4HfC5"),
new Werkstoff.Stats().setMass(192)
.setMass(962)
.setMeltingPoint(4263),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust()
.addMetalItems()
.addMolten()
.setBlacklist(OrePrefixes.plate),
11503,
TextureSet.SET_METALLIC);

public static HashMap<OrePrefixes, BWMetaGeneratedItems> items = new HashMap<>();
public static HashBiMap<Werkstoff, Fluid> fluids = HashBiMap.create();
public static HashBiMap<Werkstoff, Fluid> molten = HashBiMap.create();
Expand Down
1 change: 1 addition & 0 deletions src/main/java/bwcrossmod/tectech/tileentites/tiered/LowPowerLaser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import tectech.mechanics.pipe.IConnectsToEnergyTunnel;
import tectech.thing.metaTileEntity.pipe.MTEPipeEnergy;

@Deprecated
public interface LowPowerLaser extends IMetaTileEntity, IConnectsToEnergyTunnel {

boolean isSender();
Expand Down
1 change: 1 addition & 0 deletions src/main/java/bwcrossmod/tectech/tileentites/tiered/LowPowerLaserBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.MTETieredMachineBlock;

@Deprecated
public abstract class LowPowerLaserBase extends MTETieredMachineBlock implements LowPowerLaser {

protected long AMPERES;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/bwcrossmod/tectech/tileentites/tiered/MTELowPowerLaserBox.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.util.GTUtility;

@Deprecated
public class MTELowPowerLaserBox extends LowPowerLaserBase {

public MTELowPowerLaserBox(int aID, String aName, String aNameRegional, int aTier, long aAmperes,
Expand Down Expand Up @@ -161,7 +162,8 @@ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirec

@Override
public String[] getDescription() {
return new String[] { "Like a transformer... but for LASERS!",
return new String[] { EnumChatFormatting.RED + "DEPRECATED! This will be removed in the next major update.",
"Like a transformer... but for LASERS!",
"Transfer rate: " + EnumChatFormatting.YELLOW
+ GTUtility.formatNumbers(this.getTotalPower())
+ EnumChatFormatting.WHITE
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/bwcrossmod/tectech/tileentites/tiered/MTELowPowerLaserDynamo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@

package bwcrossmod.tectech.tileentites.tiered;

import net.minecraft.util.EnumChatFormatting;

import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoTunnel;

@Deprecated
public class MTELowPowerLaserDynamo extends MTEHatchDynamoTunnel implements LowPowerLaser {

public MTELowPowerLaserDynamo(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
Expand Down Expand Up @@ -55,7 +58,10 @@ public long getAMPERES() {

@Override
public String[] getDescription() {
return mDescriptionArray;
String[] desc = new String[mDescriptionArray.length + 1];
desc[0] = EnumChatFormatting.RED + "DEPRECATED! This machine will be removed in the next major update.";
System.arraycopy(mDescriptionArray, 0, desc, 1, mDescriptionArray.length);
return desc;
}

@Override
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/bwcrossmod/tectech/tileentites/tiered/MTELowPowerLaserHatch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@

package bwcrossmod.tectech.tileentites.tiered;

import net.minecraft.util.EnumChatFormatting;

import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyTunnel;

@Deprecated
public class MTELowPowerLaserHatch extends MTEHatchEnergyTunnel implements LowPowerLaser {

public MTELowPowerLaserHatch(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
Expand All @@ -30,7 +33,10 @@ public MTELowPowerLaserHatch(String aName, int aTier, int aAmp, String[] aDescri

@Override
public String[] getDescription() {
return mDescriptionArray;
String[] desc = new String[mDescriptionArray.length + 1];
desc[0] = EnumChatFormatting.RED + "DEPRECATED! This machine will be removed in the next major update.";
System.arraycopy(mDescriptionArray, 0, desc, 1, mDescriptionArray.length);
return desc;
}

@Override
Expand Down
Loading

0 comments on commit 4560720

Please sign in to comment.