Skip to content

Commit 86f0c46

Browse files
committed
fix cursemaven breaking
1 parent 26a8148 commit 86f0c46

5 files changed

Lines changed: 15 additions & 8 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ task generateChangelog {
122122
if (changes.length() == 1) {
123123
changes << processedLine
124124
} else {
125-
if(processedLine.trim() != "" && processedLine.startsWith("-"))
125+
if(processedLine.trim() != "" && processedLine.startsWith("-") && !processedLine.startsWith("- !"))
126126
changes << "\n$processedLine"
127127
}
128128
}

common/src/main/java/com/oroarmor/netherite_plus/client/gui/screen/NetheriteAnvilScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected void setup() {
116116
nameField.setFocusUnlocked(false);
117117
nameField.setEditableColor(-1);
118118
nameField.setUneditableColor(-1);
119-
nameField.setHasBorder(false);
119+
nameField.setDrawsBackground(false);
120120
nameField.setMaxLength(35);
121121
nameField.setChangedListener(this::onRenamed);
122122
children.add(nameField);

fabric/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ def runAlways(List<String> mods) {
9393
}
9494
}
9595
}
96+
sourceSets {
97+
main {
98+
java {
99+
exclude "com/oroarmor/netherite_plus/mixin/better_end"
100+
}
101+
}
102+
}
96103

97104
dependencies {
98105

@@ -113,7 +120,7 @@ dependencies {
113120
"com.misterpemodder:shulkerboxtooltip:${project.shulkerboxtooltip}+"+/*${project.minecraft_version}*/"1.16.4",
114121
], true)
115122

116-
modCompileOnly "curse.maven:betterend-413596:3203464"
123+
// modCompileOnly "curse.maven:betterend-413596:3168267"
117124

118125
modCompile("com.terraformersmc:modmenu:${project.modmenu}") {
119126
exclude(module: "fabric-api")

fabric/src/main/java/com/oroarmor/netherite_plus/mixin/NetheritePlusMixinPlugin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
3434
public List<String> getMixins() {
3535
return new ArrayList<String>() {{
3636
if(FabricLoader.getInstance().isModLoaded("betterend")) {
37-
this.add("better_end.NetheriteAnvilScreenHandlerMixin");
38-
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
39-
this.add("better_end.NetheriteAnvilScreenMixin");
40-
}
37+
// this.add("better_end.NetheriteAnvilScreenHandlerMixin");
38+
// if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
39+
// this.add("better_end.NetheriteAnvilScreenMixin");
40+
// }
4141
}
4242
if(FabricLoader.getInstance().isModLoaded("trinkets")) {
4343
this.add("trinkets.NetheriteElytraMixin");

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ project_name=Netherite Plus Mod
1414
fabric_version=0.30.0+1.16
1515
forge_version=36.0.0
1616
architectury_version=1.5.105
17-
mappings=1.16.5+build.3
17+
mappings=1.16.5+build.5

0 commit comments

Comments
 (0)