Skip to content

Commit 42ef8c2

Browse files
committed
Some fixes
1 parent 892e596 commit 42ef8c2

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
(${input$entity} instanceof LivingEntity _teamEnt && _teamEnt.level().getScoreboard()
1+
(${input$entity} instanceof LivingEntity _teamEnt && _teamEnt.level.getScoreboard()
22
.getPlayersTeam(_teamEnt instanceof Player _pl ? _pl.getGameProfile().getName() : _teamEnt.getStringUUID()) != null ?
3-
_teamEnt.level().getScoreboard().getPlayersTeam(_teamEnt instanceof Player _pl ? _pl.getGameProfile().getName() : _teamEnt.getStringUUID()).getName() : "")
3+
_teamEnt.level.getScoreboard().getPlayersTeam(_teamEnt instanceof Player _pl ? _pl.getGameProfile().getName() : _teamEnt.getStringUUID()).getName() : "")

src/main/resources/forge-1.19.4/procedures/utils/entity/entity_has_item_inventory.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ private static boolean hasEntityInInventory(Entity entity, ItemStack itemstack)
44
List<NonNullList<ItemStack>> compartments = com.google.common.collect.ImmutableList.of(inventory.items, inventory.armor, inventory.offhand);
55
for (List<ItemStack> list : compartments) {
66
for (ItemStack itemstack2 : list) {
7-
if (itemstack.isSame(itemstack2)) {
7+
if (itemstack.sameItem(itemstack2)) {
88
return true;
99
}
1010
}

src/main/resources/forge-1.19.4/workspacebase/build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ tasks.withType(JavaCompile).configureEach {
4343
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
4444
}
4545

46-
<#if w.getGElementsOfType('biome')?filter(e -> e.spawnBiome || e.spawnInCaves || e.spawnBiomeNether)?size != 0>
4746
mixin {
48-
add sourceSets.main, "${modid}.refmap.json"
49-
config "${modid}.mixins.json"
47+
if (file("src/main/resources/${modid}.mixins.json").exists()) {
48+
add sourceSets.main, "${modid}.refmap.json"
49+
config "${modid}.mixins.json"
50+
}
5051
}
5152

5253
dependencies {
@@ -55,10 +56,11 @@ dependencies {
5556
}
5657

5758
jar {
58-
manifest.attributes([
59-
"MixinConfigs": "${modid}.mixins.json"
60-
])
59+
if (file("src/main/resources/${modid}.mixins.json").exists()) {
60+
manifest.attributes([
61+
"MixinConfigs": "${modid}.mixins.json"
62+
])
63+
}
6164
}
62-
</#if>
6365

6466
apply from: 'mcreator.gradle'

0 commit comments

Comments
 (0)