Skip to content

Support for Mega Cells, Applied Flux and Advanced AE #40

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

Open
TakeruDavis wants to merge 1 commit into
base: forge/1.20.1
Choose a base branch
from
Open

Support for Mega Cells, Applied Flux and Advanced AE #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,13 @@ dependencies {

implementation fg.deobf("curse.maven:applied-energistics-2-223794:6091401")

runtimeOnly(fg.deobf("curse.maven:mega-cells-622112:6175008"))
runtimeOnly(fg.deobf("curse.maven:cloth-config-348521:5729105")) // Mega Cells dependency
runtimeOnly(fg.deobf("curse.maven:applied-flux-965012:7651647"))
runtimeOnly(fg.deobf("curse.maven:glodium-957920:5226922")) // Applied Flux dependency
runtimeOnly(fg.deobf("curse.maven:advancedae-1084104:5957960")) // This or it's dependency is changing creeper's model, texture and animations
runtimeOnly(fg.deobf("curse.maven:geckolib-388172:7553267")) //Advanced AE dependency

implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false })
implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}"))
compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}"))
Expand Down
41 changes: 25 additions & 16 deletions src/generated/resources/assets/createappliedkinetics/lang/en_ud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
{
"block.createappliedkinetics.energy_provider": "\u0279\u01DDp\u0131\u028Co\u0279\u0500 \u028Eb\u0279\u01DDu\u018E",
"block.createappliedkinetics.me_proxy": "\u028Exo\u0279\u0500 \u018EW",
"item.createappliedkinetics.incomplete_calculation_processor": "\u0279oss\u01DD\u0254o\u0279\u0500 uo\u0131\u0287\u0250\u05DFn\u0254\u05DF\u0250\u0186 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_calculation_processor_press": "ss\u01DD\u0279\u0500 \u0279oss\u01DD\u0254o\u0279\u0500 uo\u0131\u0287\u0250\u05DFn\u0254\u05DF\u0250\u0186 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_engineering_processor": "\u0279oss\u01DD\u0254o\u0279\u0500 bu\u0131\u0279\u01DD\u01DDu\u0131bu\u018E \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_engineering_processor_press": "ss\u01DD\u0279\u0500 \u0279oss\u01DD\u0254o\u0279\u0500 bu\u0131\u0279\u01DD\u01DDu\u0131bu\u018E \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_logic_processor": "\u0279oss\u01DD\u0254o\u0279\u0500 \u0254\u0131bo\uA780 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_logic_processor_press": "ss\u01DD\u0279\u0500 \u0279oss\u01DD\u0254o\u0279\u0500 \u0254\u0131bo\uA780 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_printed_calculation_circuit": "\u0287\u0131n\u0254\u0279\u0131\u0186 uo\u0131\u0287\u0250\u05DFn\u0254\u05DF\u0250\u0186 p\u01DD\u0287u\u0131\u0279\u0500 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_printed_engineering_circuit": "\u0287\u0131n\u0254\u0279\u0131\u0186 bu\u0131\u0279\u01DD\u01DDu\u0131bu\u018E p\u01DD\u0287u\u0131\u0279\u0500 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_printed_logic_circuit": "\u0287\u0131n\u0254\u0279\u0131\u0186 \u0254\u0131bo\uA780 p\u01DD\u0287u\u0131\u0279\u0500 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_silicon_press": "ss\u01DD\u0279\u0500 uo\u0254\u0131\u05DF\u0131S \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"item.createappliedkinetics.incomplete_silicon_print": "\u0287u\u0131\u0279\u0500 uo\u0254\u0131\u05DF\u0131S \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI",
"itemGroup.createappliedkinetics": "s\u0254\u0131\u0287\u01DDu\u0131\u029E p\u01DD\u0131\u05DFdd\u2C6F \u01DD\u0287\u0250\u01DD\u0279\u0186",
"tooltip.createappliedkinetics.energy_provider": "\u0279o\u0287d\u01DD\u0254\u0254\u2C6F \u028Eb\u0279\u01DDu\u018E\u025F\u00A7 s,\u018E\u2C6F o\u0287 \u028Eb\u0279\u01DDu\u01DD s\u01DDp\u0131\u028Co\u0279\u0500",
"tooltip.createappliedkinetics.me_proxy": "p\u0131n\u05DF\u025F/\u026F\u01DD\u0287\u0131 s,\u029E\u0279o\u028D\u0287\u01DDu\u0279\u00A7 \u1105\u018E\u2C6F\u025F\u00A7 ss\u01DD\u0254\u0254\u0250 o\u0287 \u028Exo\u0279d \u2C6F"
"block.createappliedkinetics.energy_provider": "ɹǝpıʌoɹԀ ʎbɹǝuƎ",
"block.createappliedkinetics.me_proxy": "ʎxoɹԀ ƎW",
"item.createappliedkinetics.incomplete_accumulation_processor": "ɹossǝɔoɹԀ uoıʇɐןnɯnɔɔⱯ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_accumulation_processor_press": "ssǝɹԀ ɹossǝɔoɹԀ uoıʇɐןnɯnɔɔⱯ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_calculation_processor": "ɹossǝɔoɹԀ uoıʇɐןnɔןɐƆ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_calculation_processor_press": "ssǝɹԀ ɹossǝɔoɹԀ uoıʇɐןnɔןɐƆ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_energy_processor": "ɹossǝɔoɹԀ ʎbɹǝuƎ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_energy_processor_press": "ssǝɹԀ ɹossǝɔoɹԀ ʎbɹǝuƎ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_engineering_processor": "ɹossǝɔoɹԀ buıɹǝǝuıbuƎ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_engineering_processor_press": "ssǝɹԀ ɹossǝɔoɹԀ buıɹǝǝuıbuƎ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_logic_processor": "ɹossǝɔoɹԀ ɔıboꞀ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_logic_processor_press": "ssǝɹԀ ɹossǝɔoɹԀ ɔıboꞀ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_printed_accumulation_processor": "ɹossǝɔoɹԀ uoıʇɐןnɯnɔɔⱯ pǝʇuıɹԀ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_printed_calculation_circuit": "ʇınɔɹıƆ uoıʇɐןnɔןɐƆ pǝʇuıɹԀ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_printed_energy_processor": "ɹossǝɔoɹԀ ʎbɹǝuƎ pǝʇuıɹԀ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_printed_engineering_circuit": "ʇınɔɹıƆ buıɹǝǝuıbuƎ pǝʇuıɹԀ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_printed_logic_circuit": "ʇınɔɹıƆ ɔıboꞀ pǝʇuıɹԀ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_printed_quantum_processor": "ɹossǝɔoɹԀ ɯnʇuɐnὉ pǝʇuıɹԀ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_quantum_processor": "ɹossǝɔoɹԀ ɯnʇuɐnὉ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_quantum_processor_press": "ssǝɹԀ ɹossǝɔoɹԀ ɯnʇuɐnὉ ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_silicon_press": "ssǝɹԀ uoɔıןıS ǝʇǝןdɯoɔuI",
"item.createappliedkinetics.incomplete_silicon_print": "ʇuıɹԀ uoɔıןıS ǝʇǝןdɯoɔuI",
"itemGroup.createappliedkinetics": "sɔıʇǝuıʞ pǝıןddⱯ ǝʇɐǝɹƆ",
"tooltip.createappliedkinetics.energy_provider": "ɹoʇdǝɔɔⱯ ʎbɹǝuƎɟ§ s,ƎⱯ oʇ ʎbɹǝuǝ sǝpıʌoɹԀ",
"tooltip.createappliedkinetics.me_proxy": "pınןɟ/ɯǝʇı s,ʞɹoʍʇǝuɹ§ ᄅƎⱯɟ§ ssǝɔɔɐ oʇ ʎxoɹd Ɐ"
}
9 changes: 9 additions & 0 deletions src/generated/resources/assets/createappliedkinetics/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
{
"block.createappliedkinetics.energy_provider": "Energy Provider",
"block.createappliedkinetics.me_proxy": "ME Proxy",
"item.createappliedkinetics.incomplete_accumulation_processor": "Incomplete Accumulation Processor",
"item.createappliedkinetics.incomplete_accumulation_processor_press": "Incomplete Accumulation Processor Press",
"item.createappliedkinetics.incomplete_calculation_processor": "Incomplete Calculation Processor",
"item.createappliedkinetics.incomplete_calculation_processor_press": "Incomplete Calculation Processor Press",
"item.createappliedkinetics.incomplete_energy_processor": "Incomplete Energy Processor",
"item.createappliedkinetics.incomplete_energy_processor_press": "Incomplete Energy Processor Press",
"item.createappliedkinetics.incomplete_engineering_processor": "Incomplete Engineering Processor",
"item.createappliedkinetics.incomplete_engineering_processor_press": "Incomplete Engineering Processor Press",
"item.createappliedkinetics.incomplete_logic_processor": "Incomplete Logic Processor",
"item.createappliedkinetics.incomplete_logic_processor_press": "Incomplete Logic Processor Press",
"item.createappliedkinetics.incomplete_printed_accumulation_processor": "Incomplete Printed Accumulation Processor",
"item.createappliedkinetics.incomplete_printed_calculation_circuit": "Incomplete Printed Calculation Circuit",
"item.createappliedkinetics.incomplete_printed_energy_processor": "Incomplete Printed Energy Processor",
"item.createappliedkinetics.incomplete_printed_engineering_circuit": "Incomplete Printed Engineering Circuit",
"item.createappliedkinetics.incomplete_printed_logic_circuit": "Incomplete Printed Logic Circuit",
"item.createappliedkinetics.incomplete_printed_quantum_processor": "Incomplete Printed Quantum Processor",
"item.createappliedkinetics.incomplete_quantum_processor": "Incomplete Quantum Processor",
"item.createappliedkinetics.incomplete_quantum_processor_press": "Incomplete Quantum Processor Press",
"item.createappliedkinetics.incomplete_silicon_press": "Incomplete Silicon Press",
"item.createappliedkinetics.incomplete_silicon_print": "Incomplete Silicon Print",
"itemGroup.createappliedkinetics": "Create Applied Kinetics",
Expand Down
3 changes: 3 additions & 0 deletions ...resources/assets/createappliedkinetics/models/item/incomplete_accumulation_processor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "megacells:item/accumulation_processor"
}
3 changes: 3 additions & 0 deletions ...ces/assets/createappliedkinetics/models/item/incomplete_accumulation_processor_press.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "megacells:item/accumulation_processor_press"
}
3 changes: 3 additions & 0 deletions ...rated/resources/assets/createappliedkinetics/models/item/incomplete_energy_processor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "appflux:item/energy_processor"
}
3 changes: 3 additions & 0 deletions ...resources/assets/createappliedkinetics/models/item/incomplete_energy_processor_press.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "appflux:item/energy_processor_press"
}
3 changes: 3 additions & 0 deletions ...s/assets/createappliedkinetics/models/item/incomplete_printed_accumulation_processor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "megacells:item/printed_accumulation_processor"
}
3 changes: 3 additions & 0 deletions ...sources/assets/createappliedkinetics/models/item/incomplete_printed_energy_processor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "appflux:item/printed_energy_processor"
}
3 changes: 3 additions & 0 deletions ...ources/assets/createappliedkinetics/models/item/incomplete_printed_quantum_processor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "advanced_ae:item/printed_quantum_processor"
}
3 changes: 3 additions & 0 deletions ...ated/resources/assets/createappliedkinetics/models/item/incomplete_quantum_processor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "advanced_ae:item/quantum_processor"
}
3 changes: 3 additions & 0 deletions ...esources/assets/createappliedkinetics/models/item/incomplete_quantum_processor_press.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "advanced_ae:item/quantum_processor_press"
}
31 changes: 30 additions & 1 deletion src/main/java/com/forsteri/createappliedkinetics/entry/Registration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.RegistryObject;

Expand Down Expand Up @@ -55,6 +56,33 @@ public class Registration {
sequencedIngredient("incomplete_logic_processor");
}

static {
if (ModList.get().isLoaded("appflux")) {
sequencedIngredient("incomplete_energy_processor_press",
ResourceLocation.of("appflux:item/energy_processor_press", ':'));
sequencedIngredient("incomplete_printed_energy_processor",
ResourceLocation.of("appflux:item/printed_energy_processor", ':'));
sequencedIngredient("incomplete_energy_processor",
ResourceLocation.of("appflux:item/energy_processor", ':'));
}
if (ModList.get().isLoaded("megacells")) {
sequencedIngredient("incomplete_accumulation_processor_press",
ResourceLocation.of("megacells:item/accumulation_processor_press", ':'));
sequencedIngredient("incomplete_printed_accumulation_processor",
ResourceLocation.of("megacells:item/printed_accumulation_processor", ':'));
sequencedIngredient("incomplete_accumulation_processor",
ResourceLocation.of("megacells:item/accumulation_processor", ':'));
}
if (ModList.get().isLoaded("advanced_ae")) {
sequencedIngredient("incomplete_quantum_processor_press",
ResourceLocation.of("advanced_ae:item/quantum_processor_press", ':'));
sequencedIngredient("incomplete_printed_quantum_processor",
ResourceLocation.of("advanced_ae:item/printed_quantum_processor", ':'));
sequencedIngredient("incomplete_quantum_processor",
ResourceLocation.of("advanced_ae:item/quantum_processor", ':'));
}
}

static {
CreateAppliedKinetics.REGISTERATE.addRawLang("itemGroup.createappliedkinetics", "Create Applied Kinetics");
CreateAppliedKinetics.REGISTERATE.addRawLang("tooltip.createappliedkinetics.energy_provider", "Provides energy to AE's §fEnergy Acceptor");
Expand All @@ -68,7 +96,8 @@ private static void sequencedIngredient(String name) {

private static ItemEntry<SequencedAssemblyItem> sequencedIngredient(String name, ResourceLocation model) {
return CreateAppliedKinetics.REGISTERATE.item(name, SequencedAssemblyItem::new)
.model((c, p) -> p.withExistingParent(c.getName(), model))
.model((c, p) -> p.getBuilder(c.getName())
.parent(new net.minecraftforge.client.model.generators.ModelFile.UncheckedModelFile(model)))
.register();
}

Expand Down
18 changes: 18 additions & 0 deletions src/main/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,21 @@ description='''
versionRange="[0.5.1.a,)"
ordering="NONE"
side="BOTH"
[[dependencies.createappliedkinetics]]
modId="appflux"
mandatory=false
versionRange="[0,)"
ordering="AFTER"
side="BOTH"
[[dependencies.createappliedkinetics]]
modId="megacells"
mandatory=false
versionRange="[0,)"
ordering="AFTER"
side="BOTH"
[[dependencies.createappliedkinetics]]
modId="advanced_ae"
mandatory=false
versionRange="[0,)"
ordering="AFTER"
side="BOTH"
61 changes: 61 additions & 0 deletions src/main/resources/data/advanced_ae/recipes/printed_quantum_processor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"type": "forge:conditional",
"recipes": [
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "advanced_ae"
}
],
"recipe": {
"type": "create:sequenced_assembly",
"ingredient": {
"item": "advanced_ae:quantum_alloy"
},
"transitionalItem": {
"item": "createappliedkinetics:incomplete_printed_quantum_processor"
},
"sequence": [
{
"type": "create:deploying",
"keepHeldItem": true,
"ingredients": [
{
"item": "createappliedkinetics:incomplete_printed_quantum_processor"
},
{
"item": "advanced_ae:quantum_processor_press"
}
],
"results": [
{
"item": "createappliedkinetics:incomplete_printed_quantum_processor"
}
]
},
{
"type": "create:pressing",
"ingredients": [
{
"item": "createappliedkinetics:incomplete_printed_quantum_processor"
}
],
"results": [
{
"item": "createappliedkinetics:incomplete_printed_quantum_processor"
}
]
}
],
"results": [
{
"item": "advanced_ae:printed_quantum_processor",
"count": 1
}
],
"loops": 1
}
}
]
}
76 changes: 76 additions & 0 deletions src/main/resources/data/advanced_ae/recipes/quantum_processor_create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"type": "forge:conditional",
"recipes": [
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "advanced_ae"
}
],
"recipe": {
"type": "create:sequenced_assembly",
"ingredient": {
"item": "ae2:printed_silicon"
},
"transitionalItem": {
"item": "createappliedkinetics:incomplete_quantum_processor"
},
"sequence": [
{
"type": "create:deploying",
"ingredients": [
{
"item": "createappliedkinetics:incomplete_quantum_processor"
},
{
"item": "advanced_ae:printed_quantum_processor"
}
],
"results": [
{
"item": "createappliedkinetics:incomplete_quantum_processor"
}
]
},
{
"type": "create:deploying",
"ingredients": [
{
"item": "createappliedkinetics:incomplete_quantum_processor"
},
{
"item": "minecraft:redstone"
}
],
"results": [
{
"item": "createappliedkinetics:incomplete_quantum_processor"
}
]
},
{
"type": "create:pressing",
"ingredients": [
{
"item": "createappliedkinetics:incomplete_quantum_processor"
}
],
"results": [
{
"item": "createappliedkinetics:incomplete_quantum_processor"
}
]
}
],
"results": [
{
"item": "advanced_ae:quantum_processor",
"count": 1
}
],
"loops": 1
}
}
]
}
Loading