Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

yet another round of collision fixes #994

Merged
merged 5 commits into from
Sep 11, 2024
Merged

yet another round of collision fixes #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2d9a44
collisions in natura, openblocks, PR scripts
chochem Sep 11, 2024
c35a647
mc script
chochem Sep 11, 2024
eef1a2b
malisis and ic2
chochem Sep 11, 2024
37ea832
harvestnether and gregtech
chochem Sep 11, 2024
a47f9b6
GC and genetics
chochem Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/main/java/com/dreammaster/scripts/ScriptGalacticraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,24 +1841,12 @@ private void fluidCannerRecipes() {
}

private void maceratorRecipes() {
GTValues.RA.stdBuilder().itemInputs(getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1, 12, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeteoricIron, 9L)).outputChances(10000)
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(GalacticraftMars.ID, "item.null", 1, 0, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Desh, 1L)).outputChances(10000)
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(GalacticraftMars.ID, "tile.mars", 1, 2, missing))
.itemOutputs(getModItem(GalacticraftMars.ID, "item.null", 2, 0, missing)).outputChances(10000)
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(GalacticraftCore.ID, "tile.fallenMeteor", 1, 0, missing))
.itemOutputs(getModItem(GalacticraftCore.ID, "item.meteoricIronRaw", 2, 0, missing))
.outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(GalacticraftMars.ID, "tile.asteroidsBlock", 1, 4, missing))
.itemOutputs(getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 2, 4, missing))
.outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(GalacticraftCore.ID, "item.basicItem", 1, 2, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L)).outputChances(10000)
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
}

private void plasmaArcFurnaceRecipes() {
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/com/dreammaster/scripts/ScriptGenetics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,7 @@ public void loadRecipes() {
com.dreammaster.item.ItemList.AluminiumItemCasing.getIS(8))
.itemOutputs(getModItem(Genetics.ID, "misc", 1, 0, missing)).duration(1 * MINUTES).eut(120)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Forestry.ID, "sturdyMachine", 1, 0, missing),
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 8L))
.itemOutputs(getModItem(Genetics.ID, "misc", 1, 0, missing)).duration(1 * MINUTES).eut(120)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(getModItem(Minecraft.ID, "glass_pane", 6, 0, missing), GTUtility.getIntegratedCircuit(6))
.itemOutputs(getModItem(Genetics.ID, "misc", 1, 8, missing)).duration(10 * SECONDS).eut(16)
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/com/dreammaster/scripts/ScriptGregtech.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,12 +1364,6 @@ public void loadRecipes() {
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 4L)).duration(10 * SECONDS)
.eut(16).addTo(alloySmelterRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 27L),
GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 9L))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 4L)).duration(10 * SECONDS)
.eut(16).addTo(alloySmelterRecipes);
GTValues.RA.stdBuilder()
.itemInputs(getModItem(ThaumicBases.ID, "resource", 9, 0, missing), ItemList.Shape_Mold_Ingot.get(0L))
.itemOutputs(getModItem(ThaumicBases.ID, "resource", 1, 1, missing)).duration(10 * SECONDS).eut(16)
Expand Down Expand Up @@ -1699,9 +1693,6 @@ public void loadRecipes() {
GTValues.RA.stdBuilder().itemInputs(getModItem(Thaumcraft.ID, "blockTaint", 1, 2, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)).outputChances(10000)
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(PamsHarvestCraft.ID, "walleyerawItem", 1, 0, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L)).outputChances(10000)
.duration(20 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(TinkerConstruct.ID, "GlassBlock", 1, 0, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1L)).outputChances(10000)
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
Expand All @@ -1711,9 +1702,6 @@ public void loadRecipes() {
GTValues.RA.stdBuilder().itemInputs(getModItem(BloodArsenal.ID, "glass_shard", 2, 0, missing))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1L)).outputChances(10000)
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ore, Materials.CassiteriteSand, 1L))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.CassiteriteSand, 4L))
.outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
GTModHandler.addSmeltingRecipe(
GTOreDictUnificator.get(OrePrefixes.ore, Materials.Magnetite, 1L),
getModItem(Minecraft.ID, "iron_ingot", 1, 0, missing));
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/com/dreammaster/scripts/ScriptHarvestcraftNether.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,24 +152,6 @@ public void loadRecipes() {
getModItem(PamsHarvestTheNether.ID, "glowflowerseedItem", 1, 0, missing),
getModItem(PamsHarvestTheNether.ID, "glowFlower", 1, 0, missing));

GTValues.RA.stdBuilder().itemInputs(getModItem(PamsHarvestTheNether.ID, "netherLog", 1, 0, missing))
.itemOutputs(
getModItem(PamsHarvestTheNether.ID, "netherPlanks", 6, 0, missing),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
.fluidInputs(FluidRegistry.getFluidStack("water", 5)).duration(10 * SECONDS).eut(8)
.addTo(cutterRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(PamsHarvestTheNether.ID, "netherLog", 1, 0, missing))
.itemOutputs(
getModItem(PamsHarvestTheNether.ID, "netherPlanks", 6, 0, missing),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
.fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 3)).duration(10 * SECONDS).eut(8)
.addTo(cutterRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(PamsHarvestTheNether.ID, "netherLog", 1, 0, missing))
.itemOutputs(
getModItem(PamsHarvestTheNether.ID, "netherPlanks", 6, 0, missing),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
.fluidInputs(FluidRegistry.getFluidStack("lubricant", 1)).duration(10 * SECONDS).eut(8)
.addTo(cutterRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "stone_slab", 1, 7, missing))
.itemOutputs(getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 2, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("water", 5)).duration(5 * SECONDS).eut(16)
Expand Down
110 changes: 0 additions & 110 deletions src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,20 +1605,12 @@ public void loadRecipes() {
getModItem(IndustrialCraft2.ID, "itemCasing", 8, 6, missing))
.itemOutputs(getModItem(IndustrialCraft2.ID, "itemContainmentbox", 1, 0, missing))
.duration(15 * SECONDS).eut(120).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(getModItem(Minecraft.ID, "chest", 1, 0, missing), ItemList.IC2_Item_Casing_Lead.get(8L))
.itemOutputs(getModItem(IndustrialCraft2.ID, "itemContainmentbox", 1, 0, missing))
.duration(15 * SECONDS).eut(120).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "chest", 1, 0, missing),
getModItem(IndustrialCraft2.ID, "itemCasing", 5, 2, missing))
.itemOutputs(getModItem(IndustrialCraft2.ID, "itemToolbox", 1, 0, missing)).duration(15 * SECONDS)
.eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(getModItem(Minecraft.ID, "chest", 1, 0, missing), ItemList.IC2_Item_Casing_Bronze.get(5L))
.itemOutputs(getModItem(IndustrialCraft2.ID, "itemToolbox", 1, 0, missing)).duration(15 * SECONDS)
.eut(30).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(IndustrialCraft2.ID, "itemUran238", 6, 0, missing),
Expand Down Expand Up @@ -1839,105 +1831,6 @@ public void loadRecipes() {
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 8000)).duration(6 * SECONDS + 9 * TICKS)
.eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
21,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:16000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 16000))
.duration(12 * SECONDS + 18 * TICKS).eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
19,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:24000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 24000))
.duration(19 * SECONDS + 7 * TICKS).eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
16,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:32000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 32000))
.duration(25 * SECONDS + 16 * TICKS).eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
13,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:40000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 40000))
.duration(32 * SECONDS + 5 * TICKS).eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
10,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:48000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 48000))
.duration(38 * SECONDS + 14 * TICKS).eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
7,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:54000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 54000))
.duration(43 * SECONDS + 10 * TICKS).eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
4,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:62000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 62000)).duration(50 * SECONDS).eut(1)
.addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
1,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:70000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 70000))
.duration(56 * SECONDS + 9 * TICKS).eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemArmorCFPack", 1, 26, missing))
.itemOutputs(
createItemStack(
IndustrialCraft2.ID,
"itemArmorCFPack",
1,
1,
"{Fluid:{FluidName:\"ic2constructionfoam\",Amount:80000}}",
missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2constructionfoam", 80000))
.duration(1 * MINUTES + 4 * SECONDS + 10 * TICKS).eut(1).addTo(fluidCannerRecipes);
GTValues.RA.stdBuilder().itemInputs(CustomItemList.TenKCell.get(1L))
.itemOutputs(getModItem(IndustrialCraft2.ID, "reactorCoolantSimple", 1, 1, missing))
.fluidInputs(FluidRegistry.getFluidStack("ic2coolant", 1000)).duration(16).eut(1)
Expand Down Expand Up @@ -1975,9 +1868,6 @@ public void loadRecipes() {
GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "iron_boots", 1, 0, missing))
.itemOutputs(getModItem(IndustrialCraft2.ID, "itemStaticBoots", 1, 0, missing)).duration(30 * SECONDS)
.eut(30).addTo(polarizerRecipes);
GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Steel, 1L))
.itemOutputs(getModItem(IndustrialCraft2.ID, "blockMiningPipe", 1, 0, missing)).duration(5 * SECONDS)
.eut(4).addTo(wiremillRecipes);
GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Steel, 1L))
.itemOutputs(getModItem(IndustrialCraft2.ID, "blockMiningPipe", 2, 0, missing))
.duration(7 * SECONDS + 10 * TICKS).eut(8).addTo(wiremillRecipes);
Expand Down
42 changes: 0 additions & 42 deletions src/main/java/com/dreammaster/scripts/ScriptMalisDoors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,55 +1237,13 @@ public void loadRecipes() {
.itemOutputs(getModItem(MalisisDoors.ID, "item.shoji_door", 1, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.iron", 16)).duration(20 * SECONDS).eut(4)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "paper", 2, 0, missing),
getModItem(Natura.ID, "natura.stick", 2, wildcard, missing))
.itemOutputs(getModItem(MalisisDoors.ID, "item.shoji_door", 1, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.iron", 16)).duration(20 * SECONDS).eut(4)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "paper", 2, 0, missing),
getModItem(BiomesOPlenty.ID, "bamboo", 2, 0, missing))
.itemOutputs(getModItem(MalisisDoors.ID, "item.shoji_door", 1, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.iron", 16)).duration(20 * SECONDS).eut(4)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "paper", 2, 0, missing),
getModItem(BiomesOPlenty.ID, "plants", 2, 8, missing))
.itemOutputs(getModItem(MalisisDoors.ID, "item.shoji_door", 1, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.iron", 16)).duration(20 * SECONDS).eut(4)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "paper", 2, 0, missing),
getModItem(Minecraft.ID, "stick", 2, 0, missing))
.itemOutputs(getModItem(MalisisDoors.ID, "item.shoji_door", 1, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.copper", 16)).duration(20 * SECONDS).eut(4)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "paper", 2, 0, missing),
getModItem(Natura.ID, "natura.stick", 2, wildcard, missing))
.itemOutputs(getModItem(MalisisDoors.ID, "item.shoji_door", 1, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.copper", 16)).duration(20 * SECONDS).eut(4)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "paper", 2, 0, missing),
getModItem(BiomesOPlenty.ID, "bamboo", 2, 0, missing))
.itemOutputs(getModItem(MalisisDoors.ID, "item.shoji_door", 1, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.copper", 16)).duration(20 * SECONDS).eut(4)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "paper", 2, 0, missing),
getModItem(BiomesOPlenty.ID, "plants", 2, 8, missing))
.itemOutputs(getModItem(MalisisDoors.ID, "item.shoji_door", 1, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.copper", 16)).duration(20 * SECONDS).eut(4)
.addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Minecraft.ID, "carpet", 3, 10, missing),
Expand Down
Loading