Skip to content

Commit fc18fae

Browse files
MarbleGateKeeperMarbleGateKeeper
committed
1.3.1
1 parent c1caa5f commit fc18fae

File tree

8 files changed

+47
-105
lines changed

8 files changed

+47
-105
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Welcome to **Create Enchantment Industry**
1+
## Welcome to **Create: Enchantment Industry**
22
A mod offering more tools and methods to handle experience & enchantment in Create.
33

44
## Contribute

‎build.gradle

+4-16
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import me.modmuss50.mpp.ReleaseType
33
plugins {
44
id 'idea'
55
id 'maven-publish'
6-
id "net.neoforged.moddev.legacyforge" version "2.0.78"
6+
id "net.neoforged.moddev.legacyforge" version "2.0.74"
77
id "me.modmuss50.mod-publish-plugin" version "0.8.4"
88
}
99

@@ -27,7 +27,7 @@ idea {
2727
legacyForge {
2828
version = "$minecraft_version-$forge_version"
2929

30-
// TODO - Try turning this on later see Create
30+
// TODO - Try turning this on later see Create
3131
validateAccessTransformers = false
3232
accessTransformers.from "src/main/resources/META-INF/accesstransformer.cfg"
3333

@@ -94,28 +94,16 @@ repositories {
9494
maven { url = "https://maven.theillusivec4.top/" } // Curios API
9595
maven { url = "https://www.cursemaven.com" }
9696
maven { url = "https://api.modrinth.com/maven" }
97-
maven {
98-
name 'DragonsPlus Maven'
99-
url "https://maven.dragons.plus/releases"
100-
}
10197
}
10298

10399
dependencies {
104-
/*jarJar("plus.dragons.createdragonlib:create_dragon_lib-${minecraft_version}") {
105-
version {
106-
strictly "${create_dragon_lib_version_range}"
107-
}
108-
transitive = false
109-
}*/
110-
111-
modImplementation("com.simibubi.create:create-${minecraft_version}:${create_version}-${create_version_number}") { transitive = false }
100+
modImplementation("com.simibubi.create:create-${minecraft_version}:${create_version}-${create_version_number}:slim") { transitive = false }
112101
modImplementation("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
113102
modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${flywheel_minecraft_version}:${flywheel_version}")
114103
modRuntimeOnly("dev.engine-room.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
115104
modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
116105
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
117-
118-
// modImplementation("plus.dragons.createdragonlib:create_dragon_lib-${minecraft_version}:${create_dragon_lib_version}")
106+
implementation("io.github.llamalad7:mixinextras-forge:0.4.1")
119107

120108
modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}")
121109
modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-forge-api:${jei_version}")

‎changelog/1.3.1.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## Create: Enchantment Industry 1.3.1
2+
3+
Update for 6.0.2
4+
5+
### FIX
6+
* Fixed Disenchanter Model (#207)
7+
* Fixed Hyper XP doesn't flow out when piped into the world (#208)
8+
9+
### Update
10+
* Update JEI Plugin

‎gradle.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
33
org.gradle.daemon=false
44

55
# Mod Versions
6-
mod_version = 1.3.0
6+
mod_version = 1.3.1
77
artifact_minecraft_version = 1.20.1
88
minecraft_version = 1.20.1
99
forge_version = 47.2.6
@@ -14,13 +14,13 @@ parchment_version = 2023.09.03
1414

1515
# Dependency Versions
1616
create_minecraft_version = 1.20.1
17-
create_version = 6.0.0
18-
create_version_number = 75
17+
create_version = 6.0.2
18+
create_version_number = 61
1919
flywheel_minecraft_version = 1.20.1
2020
flywheel_version = 1.0.1-221
2121
registrate_version = MC1.20-1.3.3
2222
jei_minecraft_version = 1.20.1
2323
jei_version = 15.19.0.85
2424
curios_minecraft_version = 1.20.1
2525
curios_version = 5.3.1
26-
ponder_version = 1.0.38
26+
ponder_version = 1.0.51

‎src/main/java/plus/dragons/createenchantmentindustry/compat/jei/category/DisenchantingCategory.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ public void setRecipe(IRecipeLayoutBuilder builder, DisenchantRecipe recipe, IFo
2929
.setBackground(getRenderedSlot(), -1, -1)
3030
.addIngredients(recipe.getIngredients().get(0));
3131

32-
builder.addSlot(RecipeIngredientRole.OUTPUT, 139, 25)
33-
.setBackground(getRenderedSlot(), -1, -1)
34-
.addFluidStack(CeiFluids.EXPERIENCE.get().getSource(),recipe.getExperience())
35-
.addRichTooltipCallback(addFluidTooltip(recipe.getExperience()));
32+
addFluidSlot(builder, 139, 25, recipe.getFluidResults().get(0));
33+
34+
//builder.addSlot(RecipeIngredientRole.OUTPUT, 139, 25)
35+
//.setBackground(getRenderedSlot(), -1, -1)
36+
//.addFluidStack(CeiFluids.EXPERIENCE.get().getSource(),recipe.getExperience());
37+
//.addRichTooltipCallback(addFluidTooltip(recipe.getExperience()));
3638

3739
if(!recipe.hasNoResult())
3840
builder.addSlot(RecipeIngredientRole.OUTPUT, 139, 5)

‎src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/waitingForAPI/OpenEndedPipeMixin.java renamed to ‎src/main/java/plus/dragons/createenchantmentindustry/foundation/mixin/OpenEndedPipeMixin.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package plus.dragons.createenchantmentindustry.foundation.mixin.waitingForAPI;
1+
package plus.dragons.createenchantmentindustry.foundation.mixin;
22

33
import com.simibubi.create.content.fluids.OpenEndedPipe;
44
import net.createmod.catnip.math.VecHelper;
@@ -25,7 +25,6 @@
2525

2626
@Mixin(value = OpenEndedPipe.class)
2727
public class OpenEndedPipeMixin {
28-
// TODO temporary solution. Waiting for API.
2928

3029
@Shadow(remap = false)
3130
private Level world;
@@ -42,7 +41,7 @@ public class OpenEndedPipeMixin {
4241

4342
@Inject(method = "provideFluidToSpace", at = @At("HEAD"), cancellable = true, remap = false)
4443
private void inject(FluidStack fluid, boolean simulate, CallbackInfoReturnable<Boolean> cir){
45-
if(fluid.getFluid().isSame(CeiFluids.EXPERIENCE.get())){
44+
if(fluid.getFluid().isSame(CeiFluids.EXPERIENCE.get()) || fluid.getFluid().isSame(CeiFluids.HYPER_EXPERIENCE.get())){
4645
if (world != null && world.isLoaded(this.outputPos) && !simulate) {
4746
if (world instanceof PonderLevel){
4847
var speed = new Vec3(outputPos.getX() - pos.getX() + Math.random() * 0.1,

‎src/main/resources/assets/create_enchantment_industry/models/block/disenchanter.json

+19-76
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,38 @@
11
{
2-
"credit": "By LimonBlaze, made with Blockbench",
2+
"credit": "Made with Blockbench",
33
"parent": "block/block",
44
"render_type": "cutout_mipped",
55
"textures": {
6-
"particle": "create_enchantment_industry:block/disenchanter_side",
7-
"side": "create_enchantment_industry:block/disenchanter_side",
8-
"top": "create_enchantment_industry:block/disenchanter_top",
9-
"bottom": "create:block/copper_casing",
10-
"pump": "create:block/pump"
6+
"0": "create_enchantment_industry:block/disenchanter_side",
7+
"1": "create_enchantment_industry:block/disenchanter_top",
8+
"3": "create:block/pump",
9+
"4": "create:block/copper_underside",
10+
"particle": "create_enchantment_industry:block/disenchanter_side"
1111
},
1212
"elements": [
1313
{
1414
"from": [0, 0, 0],
15-
"to": [16, 2, 16],
16-
"faces": {
17-
"north": {"uv": [0, 14, 16, 16], "texture": "#side"},
18-
"east": {"uv": [0, 14, 16, 16], "texture": "#side"},
19-
"south": {"uv": [0, 14, 16, 16], "texture": "#side"},
20-
"west": {"uv": [0, 14, 16, 16], "texture": "#side"},
21-
"up": {"uv": [0, 0, 16, 16], "texture": "#bottom"},
22-
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
23-
}
24-
},
25-
{
26-
"from": [0, 2, 0],
27-
"to": [16, 13, 2],
28-
"faces": {
29-
"north": {"uv": [0, 3, 16, 14], "texture": "#side"},
30-
"east": {"uv": [14, 3, 16, 14], "texture": "#side"},
31-
"south": {"uv": [0, 3, 16, 14], "texture": "#side"},
32-
"west": {"uv": [0, 3, 2, 14], "texture": "#side"},
33-
"up": {"uv": [0, 0, 16, 2], "texture": "#top"}
34-
}
35-
},
36-
{
37-
"from": [0, 2, 14],
3815
"to": [16, 13, 16],
3916
"faces": {
40-
"north": {"uv": [0, 3, 16, 14], "texture": "#side"},
41-
"east": {"uv": [0, 3, 2, 14], "texture": "#side"},
42-
"south": {"uv": [0, 3, 16, 14], "texture": "#side"},
43-
"west": {"uv": [14, 3, 16, 14], "texture": "#side"},
44-
"up": {"uv": [0, 14, 16, 16], "texture": "#top"}
45-
}
46-
},
47-
{
48-
"from": [14, 2, 2],
49-
"to": [16, 13, 14],
50-
"faces": {
51-
"east": {"uv": [2, 3, 14, 14], "texture": "#side"},
52-
"west": {"uv": [2, 3, 14, 14], "texture": "#side"},
53-
"up": {"uv": [14, 2, 16, 14], "texture": "#top"}
17+
"north": {"uv": [0, 3, 16, 16], "texture": "#0"},
18+
"east": {"uv": [0, 3, 16, 16], "texture": "#0"},
19+
"south": {"uv": [0, 3, 16, 16], "texture": "#0"},
20+
"west": {"uv": [0, 3, 16, 16], "texture": "#0"},
21+
"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
22+
"down": {"uv": [0, 0, 16, 16], "texture": "#4"}
5423
}
5524
},
5625
{
57-
"from": [0, 2, 2],
26+
"from": [14, 5, 2],
5827
"to": [2, 13, 14],
28+
"rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 2]},
5929
"faces": {
60-
"east": {"uv": [2, 3, 14, 14], "texture": "#side"},
61-
"west": {"uv": [2, 3, 14, 14], "texture": "#side"},
62-
"up": {"uv": [0, 2, 2, 14], "texture": "#top"}
63-
}
64-
},
65-
{
66-
"from": [2, 12, 2],
67-
"to": [14, 13, 14],
68-
"faces": {
69-
"up": {"uv": [2, 2, 14, 14], "texture": "#top"}
30+
"north": {"uv": [2, 3, 14, 11], "texture": "#0"},
31+
"east": {"uv": [2, 3, 14, 11], "texture": "#0"},
32+
"south": {"uv": [2, 3, 14, 11], "texture": "#0"},
33+
"west": {"uv": [2, 3, 14, 11], "texture": "#0"},
34+
"down": {"uv": [0, 0, 6, 6], "texture": "#3"}
7035
}
71-
},
72-
{
73-
"from": [2, 4, 2],
74-
"to": [14, 5, 14],
75-
"faces": {
76-
"up": {"uv": [0, 0, 12, 12], "texture": "#pump"}
77-
}
78-
}
79-
],
80-
"groups": [
81-
{
82-
"name": "static",
83-
"origin": [8, 8, 8],
84-
"color": 0,
85-
"children": [
86-
{
87-
"name": "drain",
88-
"origin": [8, 8, 8],
89-
"color": 0,
90-
"children": [0, 1, 2, 3, 4, 5, 6]
91-
}
92-
]
9336
}
9437
]
9538
}

‎src/main/resources/create_enchantment_industry.mixins.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"dragonLibLegacy.CreateAdvancementConstructor",
2424
"dragonLibLegacy.CreateAdvancementMixin",
2525
"dragonLibLegacy.FluidReactionsMixin",
26-
"waitingForAPI.OpenEndedPipeMixin"
26+
"OpenEndedPipeMixin"
2727
],
2828
"client": [
2929
"CameraMixin"

0 commit comments

Comments
 (0)