imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update NeoForge to 21.0.78-beta to account for breaking changes (#539)

Browse Source 
* fix compiler errors and update to 21.0.78-beta

* Update RegistrarManagerImpl.java
This commit is contained in:
Jab125
2024-07-11 11:36:08 +10:00
committed by GitHub
parent 4e5f1eee9e
commit cd9551fab2
5 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -19,7 +19,7 @@ fabric_api_version=0.100.0+1.21
mod_menu_version=11.0.1
forge_version=51.0.0
neoforge_version=21.0.42-beta
neoforge_version=21.0.78-beta
# Set to empty if not snapshots
neoforge_pr=

34
neoforge/src/main/java/dev/architectury/registry/forge/CreativeTabRegistryImpl.java
View File

@@ -63,13 +63,13 @@ public class CreativeTabRegistryImpl {
if (keyEntry.getKey() instanceof TabKey.SupplierTabKey supplierTabKey) {
if (Objects.equals(CreativeModeTabRegistry.getName(event.getTab()), supplierTabKey.supplier().getId())) {
for (ItemStack stack : stacks.get()) {
event.getEntries().put(stack, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS);
event.accept(stack, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS);
}
}
} else if (keyEntry.getKey() instanceof TabKey.DirectTabKey directTabKey) {
if (event.getTab().equals(directTabKey.tab())) {
for (ItemStack stack : stacks.get()) {
event.getEntries().put(stack, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS);
event.accept(stack, CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS);
}
}
}
@@ -161,44 +161,24 @@ public class CreativeTabRegistryImpl {
BUILD_CONTENTS_LISTENERS.add(event -> {
if (tab.isPresent()) {
if (event.getTab().equals(tab.get())) {
filler.accept(event.getFlags(), wrapTabOutput(event.getEntries()), event.hasPermissions());
filler.accept(event.getFlags(), wrapTabOutput(event), event.hasPermissions());
}
} else if (Objects.equals(CreativeModeTabRegistry.getName(event.getTab()), tab.getId())) {
filler.accept(event.getFlags(), wrapTabOutput(event.getEntries()), event.hasPermissions());
filler.accept(event.getFlags(), wrapTabOutput(event), event.hasPermissions());
}
});
}
private static CreativeTabOutput wrapTabOutput(MutableHashedLinkedMap<ItemStack, CreativeModeTab.TabVisibility> entries) {
private static CreativeTabOutput wrapTabOutput(BuildCreativeModeTabContentsEvent event) {
return new CreativeTabOutput() {
@Override
public void acceptAfter(ItemStack after, ItemStack stack, CreativeModeTab.TabVisibility visibility) {
if (after.isEmpty()) {
entries.put(stack, visibility);
} else {
for (Map.Entry<ItemStack, CreativeModeTab.TabVisibility> entry : entries) {
if (ItemStack.isSameItemSameComponents(entry.getKey(), after)) {
after = entry.getKey();
break;
}
}
entries.putAfter(after, stack, visibility);
}
event.insertAfter(after, stack, visibility);
}
@Override
public void acceptBefore(ItemStack before, ItemStack stack, CreativeModeTab.TabVisibility visibility) {
if (before.isEmpty()) {
entries.put(stack, visibility);
} else {
for (Map.Entry<ItemStack, CreativeModeTab.TabVisibility> entry : entries) {
if (ItemStack.isSameItemSameComponents(entry.getKey(), before)) {
before = entry.getKey();
break;
}
}
entries.putBefore(before, stack, visibility);
}
event.insertBefore(before, stack, visibility);
}
};
}

6
neoforge/src/main/java/dev/architectury/registry/level/entity/forge/SpawnPlacementsRegistryImpl.java
View File

@@ -26,7 +26,7 @@ import net.minecraft.world.entity.Mob;
import net.minecraft.world.entity.SpawnPlacementType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.level.levelgen.Heightmap;
import net.neoforged.neoforge.event.entity.SpawnPlacementRegisterEvent;
import net.neoforged.neoforge.event.entity.RegisterSpawnPlacementsEvent;
import java.util.ArrayList;
import java.util.List;
@@ -42,10 +42,10 @@ public class SpawnPlacementsRegistryImpl {
static {
EventBusesHooks.whenAvailable(ArchitecturyConstants.MOD_ID, bus -> {
bus.<SpawnPlacementRegisterEvent>addListener(event -> {
bus.<RegisterSpawnPlacementsEvent>addListener(event -> {
for (Entry<?> entry : entries) {
Entry<Mob> casted = (Entry<Mob>) entry;
event.register(casted.type().get(), casted.spawnPlacement(), casted.heightmapType(), casted.spawnPredicate(), SpawnPlacementRegisterEvent.Operation.OR);
event.register(casted.type().get(), casted.spawnPlacement(), casted.heightmapType(), casted.spawnPredicate(), RegisterSpawnPlacementsEvent.Operation.OR);
}
entries = null;
});

5
neoforge/src/main/java/dev/architectury/registry/registries/forge/RegistrarManagerImpl.java
View File

@@ -286,6 +286,11 @@ public class RegistrarManagerImpl {
return holder = registrar.getHolder(getId());
}
@Override
public ResourceKey<E> getKey() {
return RegistrySupplierImpl.super.getKey();
}
@Override
public RegistrarManager getRegistrarManager() {
return RegistrarManager.get(modId);

2
neoforge/src/main/resources/META-INF/neoforge.mods.toml
View File

@@ -24,7 +24,7 @@ side = "BOTH"
[[dependencies.architectury]]
modId = "neoforge"
type = "required"
versionRange = "[21.0.40-beta,)"
versionRange = "[21.0.78-beta,)"
ordering = "NONE"
side = "BOTH"