Skip to content

Commit

Permalink
Merge branch 'master' into drops
Browse files Browse the repository at this point in the history
  • Loading branch information
@boubou19
boubou19 authored Aug 15, 2024
2 parents f90ee50 + 4570e7a commit 258d9bd
Show file tree
Hide file tree
Showing 19 changed files with 2,623 additions and 9,078 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.150:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.01:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false }
Expand Down
40 changes: 24 additions & 16 deletions src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,41 @@
package com.dreammaster.bartworksHandler;

import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
import static com.github.bartimaeusnek.bartworks.util.BWRecipes.calcDecayTicks;
import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS;

import net.minecraft.item.ItemStack;

import com.github.bartimaeusnek.bartworks.util.BWRecipes;

import gregtech.api.enums.GT_Values;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.minecraft.ItemUtils;

public class BW_RadHatchMaterial {

public static void runRadHatchAdder() {
if (!GTPlusPlus.isModLoaded()) {
return;
}

ItemStack err = ItemUtils.getErrorStack(1);

for (Material material : Material.mMaterialMap) {
if (material == null || material.vRadiationLevel <= 0) {
continue;
}

if (GTPlusPlus.isModLoaded()) {
ItemStack err = ItemUtils.getErrorStack(1);

for (Material material : Material.mMaterialMap) {
if (material != null && material.vRadiationLevel > 0) {
int level = (int) material.getProtons();
short[] rgba = material.getRGBA();
if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) {
BWRecipes.instance.addRadHatch(material.getRod(1), level, 1, rgba);
}
if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) {
BWRecipes.instance.addRadHatch(material.getLongRod(1), level, 2, rgba);
}
}
int level = (int) material.getProtons();
if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) {
GT_Values.RA.stdBuilder().itemInputs(material.getRod(1)).duration(1).eut(level)
.metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes);
}
if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) {
GT_Values.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(2).eut(level)
.metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes);
}

}

}
}
533 changes: 208 additions & 325 deletions src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
View file

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.dreammaster.bartworksHandler;

import static com.dreammaster.bartworksHandler.BacteriaRegistry.CultureSet;
import static com.github.bartimaeusnek.bartworks.API.BioRecipeAdder.CLEANROOM;
import static com.github.bartimaeusnek.bartworks.API.BioRecipeAdder.addBacterialVatRecipe;
import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static com.github.bartimaeusnek.bartworks.util.BWRecipes.computeSieverts;
import static gregtech.api.enums.GT_Values.*;
import static gregtech.api.enums.Mods.BartWorks;
import static gregtech.api.enums.Mods.PamsHarvestCraft;
Expand All @@ -12,6 +12,7 @@
import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeConstants.SIEVERTS;
import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;

import net.minecraft.init.Items;
Expand All @@ -24,6 +25,7 @@
import com.dreammaster.main.MainRegistry;
import com.github.bartimaeusnek.bartworks.MainMod;
import com.github.bartimaeusnek.bartworks.common.items.SimpleSubItemClass;
import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList;

import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GT_Values;
Expand All @@ -38,7 +40,6 @@ public class BioItemLoader {

private static Item BIOTEMS;
private static GT_Fluid[] BIOFLUIDS;
private static ItemStack[] BIOTEMSSTACKS;

public static boolean preInit() {
try {
Expand Down Expand Up @@ -111,59 +112,58 @@ public static void registerRecipes() {
.fluidOutputs(new FluidStack(BIOFLUIDS[2], 8000)).duration(60 * SECONDS).eut(TierEU.RECIPE_UV)
.addTo(multiblockChemicalReactorRecipes);

addBacterialVatRecipe(
new ItemStack[] { ItemList.IC2_Energium_Dust.get(8), Materials.Mytryl.getDust(1),
GT_ModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 64) },
CultureSet.get("TcetiEBac"),
new FluidStack[] { new FluidStack(BIOFLUIDS[2], 50) },
new FluidStack[] { new FluidStack(BIOFLUIDS[3], 50) },
1200,
(int) TierEU.RECIPE_UV,
100,
8,
0,
false);
GT_Values.RA.stdBuilder()
.itemInputs(
ItemList.IC2_Energium_Dust.get(8),
Materials.Mytryl.getDust(1),
GT_ModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 64))
.special(BioItemList.getPetriDish(CultureSet.get("TcetiEBac")))
.fluidInputs(new FluidStack(BIOFLUIDS[2], 50)).fluidOutputs(new FluidStack(BIOFLUIDS[3], 50))
.duration(1 * MINUTES).eut(TierEU.RECIPE_UV)
.metadata(SIEVERTS, computeSieverts(100, 8, false, false, false)).noOptimize()
.addTo(bacterialVatRecipes);

for (int i = 0; i < OreDictionary.getOres("cropTcetiESeaweed").size(); i++) {
GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(i + 1))
.itemOutputs(OreDictionary.getOres("cropTcetiESeaweed").get(i).copy().splitStack(64))
.fluidInputs(new FluidStack(BIOFLUIDS[3], 1000)).duration(2 * SECONDS).eut(TierEU.RECIPE_UV)
.noOptimize().addTo(centrifugeRecipes);
}
addBacterialVatRecipe(
new ItemStack[] { Materials.MeatRaw.getDust(4), Materials.Salt.getDust(4), Materials.Calcium.getDust(4),
new ItemStack(BIOTEMS, 4, 2), },
CultureSet.get("OvumBac"),
new FluidStack[] { FluidRegistry.getFluidStack("binnie.bacteria", 4) },
new FluidStack[] { Materials.GrowthMediumRaw.getFluid(1) },
1200,
7680,
Materials.Uranium,
5,
CLEANROOM,
false);
addBacterialVatRecipe(
new ItemStack[] { Materials.MeatRaw.getDust(8), Materials.Salt.getDust(8), Materials.Calcium.getDust(8),
new ItemStack(BIOTEMS, 4, 2), },
CultureSet.get("OvumBac"),
new FluidStack[] { FluidRegistry.getFluidStack("bacterialsludge", 4) },
new FluidStack[] { Materials.GrowthMediumRaw.getFluid(2) },
1200,
30720,
Materials.Plutonium,
6,
CLEANROOM,
false);
addBacterialVatRecipe(
new ItemStack[] { Materials.MeatRaw.getDust(12), Materials.Salt.getDust(12),
Materials.Calcium.getDust(12), new ItemStack(BIOTEMS, 4, 2), },
CultureSet.get("OvumBac"),
new FluidStack[] { FluidRegistry.getFluidStack("mutagen", 4) },
new FluidStack[] { Materials.GrowthMediumRaw.getFluid(4) },
1200,
122880,
Materials.NaquadahEnriched,
7,
CLEANROOM,
true);

GT_Values.RA.stdBuilder()
.itemInputs(
Materials.MeatRaw.getDust(4),
Materials.Salt.getDust(4),
Materials.Calcium.getDust(4),
new ItemStack(BIOTEMS, 4, 2))
.special(BioItemList.getPetriDish(CultureSet.get("OvumBac")))
.fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 4))
.fluidOutputs(Materials.GrowthMediumRaw.getFluid(1)).duration(1 * MINUTES).eut(TierEU.RECIPE_IV)
.metadata(SIEVERTS, computeSieverts(Materials.Uranium, 5, false, true, false)).noOptimize()
.addTo(bacterialVatRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
Materials.MeatRaw.getDust(8),
Materials.Salt.getDust(8),
Materials.Calcium.getDust(8),
new ItemStack(BIOTEMS, 4, 2))
.special(BioItemList.getPetriDish(CultureSet.get("OvumBac")))
.fluidInputs(FluidRegistry.getFluidStack("bacterialsludge", 4))
.fluidOutputs(Materials.GrowthMediumRaw.getFluid(2)).duration(1 * MINUTES).eut(TierEU.RECIPE_LuV)
.metadata(SIEVERTS, computeSieverts(Materials.Plutonium, 6, false, true, false)).noOptimize()
.addTo(bacterialVatRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
Materials.MeatRaw.getDust(12),
Materials.Salt.getDust(12),
Materials.Calcium.getDust(12),
new ItemStack(BIOTEMS, 4, 2))
.special(BioItemList.getPetriDish(CultureSet.get("OvumBac")))
.fluidInputs(FluidRegistry.getFluidStack("mutagen", 4))
.fluidOutputs(Materials.GrowthMediumRaw.getFluid(4)).duration(1 * MINUTES).eut(TierEU.RECIPE_ZPM)
.metadata(SIEVERTS, computeSieverts(Materials.NaquadahEnriched, 7, true, true, false)).noOptimize()
.addTo(bacterialVatRecipes);
}
}
9 changes: 4 additions & 5 deletions src/main/java/com/dreammaster/detrav/ScannerTools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import net.minecraft.item.ItemStack;

import com.detrav.items.DetravMetaGeneratedTool01;
import com.dreammaster.gthandler.CustomItemList;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
Expand Down Expand Up @@ -31,7 +30,7 @@ public void registerOre(OrePrefixes o, Materials material, String s, String s2,
new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_LuV, 'H',
OrePrefixes.toolHeadDrill.get(material), 'E', ItemList.Emitter_LuV, 'C',
OrePrefixes.circuit.get(Materials.LuV), 'P', OrePrefixes.plate.get(Materials.Iridium), 'B',
CustomItemList.BatteryHull_LuV_Full.get(1L) });
ItemList.BatteryHull_LuV_Full.get(1L) });
GT_ModHandler.addCraftingRecipe(
DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(
102,
Expand All @@ -44,7 +43,7 @@ public void registerOre(OrePrefixes o, Materials material, String s, String s2,
new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_ZPM, 'H',
OrePrefixes.toolHeadDrill.get(material), 'E', ItemList.Emitter_ZPM, 'C',
OrePrefixes.circuit.get(Materials.ZPM), 'P', OrePrefixes.plate.get(Materials.Osmium), 'B',
CustomItemList.BatteryHull_ZPM_Full.get(1L) });
ItemList.BatteryHull_ZPM_Full.get(1L) });
GT_ModHandler.addCraftingRecipe(
DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(
104,
Expand All @@ -57,7 +56,7 @@ public void registerOre(OrePrefixes o, Materials material, String s, String s2,
new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_UV, 'H',
OrePrefixes.toolHeadDrill.get(material), 'E', ItemList.Emitter_UV, 'C',
OrePrefixes.circuit.get(Materials.UV), 'P', OrePrefixes.plate.get(Materials.Neutronium), 'B',
CustomItemList.BatteryHull_UV_Full.get(1L) });
ItemList.BatteryHull_UV_Full.get(1L) });
GT_ModHandler.addCraftingRecipe(
DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(
106,
Expand All @@ -70,6 +69,6 @@ public void registerOre(OrePrefixes o, Materials material, String s, String s2,
new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_UHV, 'H',
OrePrefixes.toolHeadDrill.get(material), 'E', ItemList.Emitter_UHV, 'C',
OrePrefixes.circuit.get(Materials.UHV), 'P', OrePrefixes.plate.get(Materials.Infinity), 'B',
CustomItemList.BatteryHull_UHV_Full.get(1L) });
ItemList.BatteryHull_UHV_Full.get(1L) });
}
}
Loading

0 comments on commit 258d9bd

Please sign in to comment.