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

Add it Slabs and Planks from EtFuturumRequiem #1

Closed
wants to merge 7 commits into from
Closed

Add it Slabs and Planks from EtFuturumRequiem #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6f8bcf
Fix typo (#924)
Ethryan Aug 9, 2024
4e3071e
make t3 water multi not use zpm hatch because that requires t3 water …
NotAPenguin0 Aug 10, 2024
a2ca803
added wormhole generator recipe (#928)
RecursivePineapple Aug 11, 2024
001ed3c
fix eternity qft recipe (#926)
NotAPenguin0 Aug 11, 2024
9f59cf4
update
Dream-Master Aug 11, 2024
1cfbc25
add recipe for priority card (#929)
MCTBL Aug 13, 2024
9df732c
fix the recipes (#932)
NotAPenguin0 Aug 13, 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
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.142:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.148: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.2:dev') { transitive = false }
implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false }

compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.4:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.51:dev") { transitive = false }
Expand Down
71 changes: 46 additions & 25 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.dreammaster.gthandler.CustomItemList;
import com.github.technus.tectech.recipe.TT_recipeAdder;

import appeng.api.AEApi;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
Expand Down Expand Up @@ -809,8 +810,8 @@ public void run() {
ItemList.Electric_Motor_LuV.get(2),
ItemList.Robot_Arm_LuV.get(1),
ItemList.Electric_Pump_LuV.get(4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 2),
new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 },
GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.NiobiumTitanium, 8))
.fluidInputs(new FluidStack(solderIndalloy, 8 * 144), Materials.Lubricant.getFluid(16000))
.itemOutputs(ItemList.Machine_Multi_PurificationPlant.get(1)).duration(60 * SECONDS)
Expand All @@ -825,8 +826,8 @@ public void run() {
com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_LuV.get(1),
ItemList.Electric_Motor_LuV.get(4),
ItemList.Electric_Pump_LuV.get(4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 2),
new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 },
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 16))
.fluidInputs(
Materials.Osmium.getMolten(8 * 144),
Expand All @@ -848,8 +849,8 @@ public void run() {
HASTELLOY_X.getPlate(8),
ItemList.Electric_Motor_LuV.get(4),
ItemList.Electric_Pump_LuV.get(4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 8),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 4),
new Object[] { OrePrefixes.circuit.get(Materials.LuV), 8 },
new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 32))
.fluidInputs(
HASTELLOY_C276.getFluidStack(8 * 144),
Expand All @@ -865,16 +866,16 @@ public void run() {
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium, 8),
ItemList.BlockFlocculationCasing.get(8),
ItemList.Casing_Vent.get(8),
com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_ZPM.get(1),
com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_LuV.get(1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 8),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Trinium, 4),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 4),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8),
ItemList.Electric_Motor_ZPM.get(4),
ItemList.Electric_Pump_ZPM.get(4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 4),
new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 },
// Still UV circuit, for some reason the alias is not working.
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2),
new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 },
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 16))
.fluidInputs(
Materials.Iridium.getMolten(16 * 144),
Expand All @@ -897,9 +898,9 @@ public void run() {
HASTELLOY_C276.getPlate(8),
ItemList.Electric_Motor_ZPM.get(4),
ItemList.Electric_Pump_ZPM.get(4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 8),
new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 8 },
// Still UV circuit, for some reason the alias is not working.
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 4),
new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 },
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 32))
.fluidInputs(
Materials.NaquadahAlloy.getMolten(16 * 144),
Expand All @@ -922,9 +923,9 @@ public void run() {
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8),
ItemList.Electric_Motor_UV.get(4),
ItemList.Electric_Pump_UV.get(4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 16),
new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 16 },
// Still UV circuit, for some reason the alias is not working.
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 8),
new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 },
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 32))
.fluidInputs(
Materials.Neutronium.getMolten(32 * 144),
Expand All @@ -948,8 +949,8 @@ public void run() {
ItemList.Electric_Motor_UV.get(4),
ItemList.Electric_Pump_UV.get(4),
// Still UV circuit, for some reason the alias is not working.
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 8),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 4),
new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 },
new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 },
GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 64))
.fluidInputs(
Materials.Neutronium.getMolten(32 * 144),
Expand All @@ -972,8 +973,8 @@ public void run() {
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 8),
ItemList.Electric_Motor_UEV.get(4),
ItemList.Electric_Pump_UEV.get(4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 8),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 4),
new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8 },
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 32))
.fluidInputs(
Materials.Quantium.getMolten(64 * 144),
Expand All @@ -996,8 +997,8 @@ public void run() {
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16),
ItemList.Electric_Motor_UEV.get(8),
ItemList.Electric_Pump_UEV.get(8),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 16),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 8),
new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 },
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8 },
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 64))
.fluidInputs(
Materials.Longasssuperconductornameforuhvwire.getMolten(64 * 144),
Expand All @@ -1022,8 +1023,8 @@ public void run() {
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CallistoIce, 16),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnrichedHolmium, 16),
ItemList.Field_Generator_UEV.get(1),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 2),
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2 },
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16))
.fluidInputs(
Materials.Longasssuperconductornameforuhvwire.getMolten(32 * 144),
Expand All @@ -1046,8 +1047,8 @@ public void run() {
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 16),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16),
ItemList.Field_Generator_UEV.get(1),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 2),
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2 },
GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16))
.fluidInputs(
Materials.Infinity.getMolten(32 * 144),
Expand All @@ -1071,8 +1072,8 @@ public void run() {
.get(OrePrefixes.foil, Materials.Longasssuperconductornameforuhvwire, 64),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Draconium, 64),
ItemList.Field_Generator_UEV.get(1),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 2),
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2 },
GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Infinity, 16))
.fluidInputs(
Materials.Infinity.getMolten(32 * 144),
Expand Down Expand Up @@ -1125,5 +1126,25 @@ public void run() {
20000,
(int) TierEU.RECIPE_UMV);

// Miniature Wormhole Generator
TT_recipeAdder.addResearchableAssemblylineRecipe(
AEApi.instance().definitions().materials().singularity().maybeStack(1).get(),
64000,
64,
200000,
4,
new Object[] { com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Transformer.get(1),
AEApi.instance().definitions().materials().singularity().maybeStack(4).get(),
ItemList.Field_Generator_UHV.get(4), ItemList.Emitter_UHV.get(4),
ItemList.Casing_Fusion_Coil.get(4),
GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 2),
com.github.technus.tectech.thing.CustomItemList.LASERpipe.get(64), },
new FluidStack[] { new FluidStack(Materials.Neutronium.mStandardMoltenFluid, 144 * 12),
new FluidStack(Materials.Tritanium.mStandardMoltenFluid, 144 * 12),
new FluidStack(solderIndalloy, 144 * 24),
new FluidStack(Materials.SuperCoolant.mFluid, 144 * 48), },
ItemList.WormholeGenerator.get(1L),
60 * SECONDS,
(int) TierEU.RECIPE_UEV);
}
}
12 changes: 12 additions & 0 deletions src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,18 @@ public void loadRecipes() {
null,
null,
null);
// priority card
addShapedRecipe(
getModItem(AppliedEnergistics2.ID, "item.ToolPriorityCard", 1, 0, missing),
"plateTungstenSteel",
"circuitElite",
getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing),
"plateDiamond",
"plateRedAlloy",
"plateDiamond",
null,
null,
null);
// charged staff
addShapedRecipe(
getModItem(AppliedEnergistics2.ID, "item.ToolChargedStaff", 1, 0, missing),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ public void loadRecipes() {
ItemList.EnergisedTesseract.get(1),
ItemUtils.getSimpleStack(GenericChem.TemporalHarmonyCatalyst, 0))
.itemOutputs(GT_OreDictUnificator.get("dustShirabon", 64), ItemList.Timepiece.get(1))
.outputChances(25_00, 25_00).fluidInputs(MaterialsUEVplus.PrimordialMatter.getFluid(1152))
.fluidInputs(MaterialsUEVplus.PrimordialMatter.getFluid(1152))
.fluidOutputs(MaterialsUEVplus.Eternity.getMolten(9216), MaterialsUEVplus.Time.getMolten(18432))
.metadata(QFT_FOCUS_TIER, 4).duration(20 * SECONDS).eut(TierEU.RECIPE_UMV)
.addTo(quantumForceTransformerRecipes);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/dreamcraft/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,7 +1533,7 @@ tc.research_text.WARMBLOOD=[WI] Mhhh warm Blood
Witchery.research_page.WARMBLOOD=The Bottle of Warm Blood is an item that can be drunk by a player. If the player is a vampire, they will restore 2 droplets of blood to the blood pool. If the player is not a vampire they will get a hunger debuff. This item allows a players to quickly get blood, or it can be used as a ingredient for the Demonic Contract.
tc.research_name.FUMEFUNNEL=Fume Funnel
tc.research_text.FUMEFUNNEL=[WI] Upgrades Yea
Witchery.research_page.FUMEFUNNEL=A fume funnel is an upgrade for the Witches Oven that increases that increases the speed (over a normal furnace) by an additional 10%, and increases the chances of a by-product being produced by a further 25%.The Fume Funnel must be positioned next to the left or right of the witches oven with the same facing. Up to two funnels can be attached to one oven. It is possible to place a funnel between two ovens for it to benefit both. A third fume funnel can also be placed on top of an oven to make it look better and also to increase its speed by a further 10%.
Witchery.research_page.FUMEFUNNEL=A fume funnel is an upgrade for the Witches Oven that increases the speed (over a normal furnace) by an additional 10%, and increases the chances of a by-product being produced by a further 25%.The Fume Funnel must be positioned next to the left or right of the witches oven with the same facing. Up to two funnels can be attached to one oven. It is possible to place a funnel between two ovens for it to benefit both. A third fume funnel can also be placed on top of an oven to make it look better and also to increase its speed by a further 10%.
tc.research_name.FUMEFILTER=Fume Filter
tc.research_text.FUMEFILTER=[WI] More By-products
Witchery.research_page.FUMEFILTER=A Fume Filter is used to upgrade a Fume Funnel to a Filtered Fume Funnel in order to increase the by-product chance of a Witches Oven.
Expand Down