Skip to content

Commit

Permalink
Merge branch 'master' into ChargingBus
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Sep 21, 2024
2 parents 000cc01 + 1a7a69c commit cc0511e
Show file tree
Hide file tree
Showing 19 changed files with 127 additions and 299 deletions.
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ dependencies {
compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.16:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.14:dev") { transitive = false }

compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false}
Expand All @@ -80,7 +80,7 @@ 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 }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.68:dev") { transitive = false }
implementation("com.github.GTNewHorizons:Hodgepodge:2.5.69:dev")
compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/bartworks/system/material/WerkstoffLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
import bartworks.system.material.werkstoff_loaders.recipe.MetalLoader;
import bartworks.system.material.werkstoff_loaders.recipe.MoltenCellLoader;
import bartworks.system.material.werkstoff_loaders.recipe.MultipleMetalLoader;
import bartworks.system.material.werkstoff_loaders.recipe.OreLoader;
import bartworks.system.material.werkstoff_loaders.recipe.RawOreLoader;
import bartworks.system.material.werkstoff_loaders.recipe.SimpleMetalLoader;
import bartworks.system.material.werkstoff_loaders.recipe.ToolLoader;
Expand Down Expand Up @@ -1657,7 +1656,7 @@ public static void run() {
}

IWerkstoffRunnable[] werkstoffRunnables = { new ToolLoader(), new DustLoader(), new GemLoader(),
new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new OreLoader(), new RawOreLoader(),
new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new RawOreLoader(),
new CrushedLoader(), new CraftingMaterialLoader(), new CellLoader(), new MoltenCellLoader(),
new MultipleMetalLoader(), new MetalLoader(), new BlockLoader() };

Expand Down
50 changes: 0 additions & 50 deletions src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
import static gregtech.api.recipe.RecipeMaps.latheRecipes;
import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
import static gregtech.api.recipe.RecipeMaps.sifterRecipes;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
Expand Down Expand Up @@ -66,13 +65,6 @@ public void run(Werkstoff werkstoff) {
.eut(2)
.addTo(compressorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(block))
.itemOutputs(werkstoff.get(gem, 9))
.duration(5 * SECONDS)
.eut(24)
.addTo(hammerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(crushedPurified))
.itemOutputs(
Expand All @@ -89,41 +81,6 @@ public void run(Werkstoff werkstoff) {

}

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(gemExquisite))
.itemOutputs(werkstoff.get(dust, 4))
.duration(20 * SECONDS)
.eut(2)
.addTo(maceratorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(gemFlawless))
.itemOutputs(werkstoff.get(dust, 2))
.duration(20 * SECONDS)
.eut(2)
.addTo(maceratorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(gem))
.itemOutputs(werkstoff.get(dust))
.duration(20 * SECONDS)
.eut(2)
.addTo(maceratorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(gemFlawed))
.itemOutputs(werkstoff.get(dustSmall, 2))
.duration(20 * SECONDS)
.eut(2)
.addTo(maceratorRecipes);

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(gemChipped))
.itemOutputs(werkstoff.get(dustSmall))
.duration(20 * SECONDS)
.eut(2)
.addTo(maceratorRecipes);

GTModHandler.addCraftingRecipe(
werkstoff.get(gemFlawless, 2),
0,
Expand Down Expand Up @@ -202,13 +159,6 @@ public void run(Werkstoff werkstoff) {
texture,
new CoverLens(BWColorUtil.getDyeFromColor(werkstoff.getRGBA()).mIndex, texture));

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(lens))
.itemOutputs(werkstoff.get(dustSmall, 3))
.duration(20 * SECONDS)
.eut(2)
.addTo(maceratorRecipes);

for (ItemStack is : OreDictionary
.getOres("craftingLens" + BWColorUtil.getDyeFromColor(werkstoff.getRGBA()).mName.replace(" ", ""))) {
is.stackSize = 0;
Expand Down
65 changes: 0 additions & 65 deletions src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java
View file

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package bartworks.system.material.werkstoff_loaders.recipe;

import static gregtech.api.enums.OrePrefixes.block;
import static gregtech.api.enums.OrePrefixes.dust;
import static gregtech.api.enums.OrePrefixes.dustSmall;
import static gregtech.api.enums.OrePrefixes.foil;
import static gregtech.api.enums.OrePrefixes.gem;
Expand All @@ -26,8 +25,6 @@
import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
import static gregtech.api.recipe.RecipeMaps.latheRecipes;
import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
import static gregtech.api.util.GTRecipeBuilder.TICKS;

import net.minecraft.item.ItemStack;

Expand Down Expand Up @@ -91,13 +88,6 @@ public void run(Werkstoff werkstoff) {
false) : TextureFactory.of(texSet.mTextures[block.mTextureIndex], werkstoff.getRGBA(), false);
GregTechAPI.registerCover(werkstoff.get(plate), texture, null);

GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(plate))
.itemOutputs(werkstoff.get(dust))
.duration(2 * TICKS)
.eut(8)
.addTo(maceratorRecipes);

return;
}

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/gregtech/api/interfaces/IItemBehaviour.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;

import com.google.common.collect.ImmutableList;

import gregtech.api.enums.SubTag;
import gregtech.api.items.MetaBaseItem;

Expand Down Expand Up @@ -64,7 +62,7 @@ boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aW
List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);

default List<String> getAdditionalToolTipsWhileSneaking(E aItem, List<String> aList, ItemStack aStack) {
return ImmutableList.of();
return aList;
}

void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
Expand Down
24 changes: 0 additions & 24 deletions src/main/java/gregtech/loaders/load/GTItemIterator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,36 +125,12 @@ public void run() {

GTLog.out.println(
"GTMod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)");
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.rotten_flesh, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
.itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
.duration(10 * SECONDS)
.eut(1)
.addTo(cannerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.spider_eye, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L))
.itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
.duration(5 * SECONDS)
.eut(1)
.addTo(cannerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L))
.itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L))
.duration(5 * SECONDS)
.eut(1)
.addTo(cannerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.cake, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(12L))
.itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L))
.duration(30 * SECONDS)
.eut(1)
.addTo(cannerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Items.mushroom_stew, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(6L))
.itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1))
.duration(15 * SECONDS)
.eut(1)
.addTo(cannerRecipes);

GTLog.out.println("GTMod: Scanning ItemList.");

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ private void registerPlateSuperdense(final Materials aMaterial, final ItemStack
GTValues.RA.stdBuilder()
.itemInputs(GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 64))
.itemOutputs(GTUtility.copyAmount(1, aStack))
.duration(Math.max(aMaterialMass * 16L, 1L))
.duration(Math.max(aMaterialMass * 32L, 1L))
.eut(calculateRecipeEU(aMaterial, 96))
.metadata(COMPRESSION_TIER, compression_tier)
.addTo(compressorRecipes);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void run() {

// carpet cleaning recipes
GTValues.RA.stdBuilder()
.itemInputs(new ItemStack(Blocks.carpet, 1, 32767))
.itemInputs(new ItemStack(Blocks.carpet, 1, i))
.itemOutputs(new ItemStack(Blocks.carpet, 1, 0))
.fluidInputs(Materials.Chlorine.getGas(25))
.duration(20 * SECONDS)
Expand Down
57 changes: 0 additions & 57 deletions src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,63 +137,6 @@ public void registerRailcraftRecipes() {
.duration(25 * SECONDS)
.eut((int) TierEU.RECIPE_LV)
.addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Coated_Basic.get(1),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4),
GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0))
.fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
.duration(10 * SECONDS)
.eut((int) TierEU.RECIPE_LV)
.addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Coated_Basic.get(1),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4),
GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1))
.fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
.duration(10 * SECONDS)
.eut((int) TierEU.RECIPE_LV)
.addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Phenolic_Good.get(1),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4),
GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2))
.fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
.duration(10 * SECONDS)
.eut((int) TierEU.RECIPE_LV)
.addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Phenolic_Good.get(1),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4),
GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3))
.fluidInputs(tMat.getMolten(1152L * tMultiplier / 2))
.duration(10 * SECONDS)
.eut((int) TierEU.RECIPE_LV)
.addTo(circuitAssemblerRecipes);

}
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static gregtech.api.enums.Mods.Railcraft;
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.HOURS;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator.sapling_Rainforest;
Expand Down Expand Up @@ -306,7 +307,7 @@ public void run() {
.get(OrePrefixes.plateSuperdense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1))
// Require stabilized black hole
.metadata(CompressionTierKey.INSTANCE, 2)
.duration(15 * MINUTES)
.duration(1 * HOURS + 15 * MINUTES)
.eut(TierEU.RECIPE_UXV)
.addTo(compressorRecipes);

Expand Down
18 changes: 10 additions & 8 deletions src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void run() {
tCrop = ItemList.Crop_Drop_Tine.get(1);
this.addProcess(tCrop, Materials.Tin, 100, true);
this.addProcess(tCrop, Materials.Cassiterite, 100, false);
this.addProcess(tCrop, Materials.CassiteriteSand, 100, true);
this.addProcess(tCrop, Materials.CassiteriteSand, 100, false);
tCrop = ItemList.Crop_Drop_Plumbilia.get(1);
this.addProcess(tCrop, Materials.Lead, 100, true);
this.addProcess(tCrop, Materials.Galena, 100, false); //
Expand Down Expand Up @@ -142,13 +142,15 @@ public void addProcess(ItemStack tCrop, Materials aMaterial, Materials aMaterial
.eut(24)
.addTo(UniversalChemical);

GTValues.RA.stdBuilder()
.itemInputs(GTUtility.copyAmount(16, tCrop))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1))
.fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10))))
.duration((int) (aMaterial.getMass() * 128))
.eut(384)
.addTo(autoclaveRecipes);
if (aMainOutput) {
GTValues.RA.stdBuilder()
.itemInputs(GTUtility.copyAmount(16, tCrop))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1))
.fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10))))
.duration((int) (aMaterial.getMass() * 128))
.eut(384)
.addTo(autoclaveRecipes);
}
}

public void addProcess(ItemStack tCrop, Materials aMaterial, int chance) {
Expand Down
Loading

0 comments on commit cc0511e

Please sign in to comment.