Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Update Forge 1.19 to 41.0.100, handle breaking changes by Forge updates

Browse source
This commit is contained in:
Mike Primm 2022-07-17 18:25:42 -05:00
parent 0cfdd9c9ca
commit 16c316dd8a
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bukkit-helper/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,5 +1,5 @@
# #
#Tue Jun 07 20:25:33 CDT 2022 #Sun Jul 17 17:43:01 CDT 2022
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

2
forge-1.19/build.gradle
View file

@ -40,7 +40,7 @@ dependencies {
implementation project(path: ":DynmapCore", configuration: "shadow") implementation project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ':DynmapCoreAPI') implementation project(path: ':DynmapCoreAPI')
minecraft 'net.minecraftforge:forge:1.19-41.0.38' minecraft 'net.minecraftforge:forge:1.19-41.0.100'
} }
processResources processResources

34
forge-1.19/src/main/java/org/dynmap/forge_1_19/DynmapPlugin.java
View file

@ -68,10 +68,10 @@ import net.minecraftforge.event.entity.player.PlayerEvent.PlayerChangedDimension
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent; import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent;
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerRespawnEvent; import net.minecraftforge.event.entity.player.PlayerEvent.PlayerRespawnEvent;
import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.level.BlockEvent;
import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.level.ChunkDataEvent;
import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.level.ChunkEvent;
import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.event.level.LevelEvent;
import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModContainer;
import net.minecraftforge.fml.loading.LoadingModList; import net.minecraftforge.fml.loading.LoadingModList;
@ -1628,7 +1628,7 @@ public class DynmapPlugin
@SubscribeEvent @SubscribeEvent
public void onPlayerLogin(PlayerLoggedInEvent event) { public void onPlayerLogin(PlayerLoggedInEvent event) {
if(!core_enabled) return; if(!core_enabled) return;
final DynmapPlayer dp = getOrAddPlayer((ServerPlayer)event.getPlayer()); final DynmapPlayer dp = getOrAddPlayer((ServerPlayer)event.getEntity());
/* This event can be called from off server thread, so push processing there */ /* This event can be called from off server thread, so push processing there */
core.getServer().scheduleServerTask(new Runnable() { core.getServer().scheduleServerTask(new Runnable() {
public void run() { public void run() {
@ -1639,8 +1639,8 @@ public class DynmapPlugin
@SubscribeEvent @SubscribeEvent
public void onPlayerLogout(PlayerLoggedOutEvent event) { public void onPlayerLogout(PlayerLoggedOutEvent event) {
if(!core_enabled) return; if(!core_enabled) return;
final DynmapPlayer dp = getOrAddPlayer((ServerPlayer)event.getPlayer()); final DynmapPlayer dp = getOrAddPlayer((ServerPlayer)event.getEntity());
final String name = event.getPlayer().getName().getString(); final String name = event.getEntity().getName().getString();
/* This event can be called from off server thread, so push processing there */ /* This event can be called from off server thread, so push processing there */
core.getServer().scheduleServerTask(new Runnable() { core.getServer().scheduleServerTask(new Runnable() {
public void run() { public void run() {
@ -1652,12 +1652,12 @@ public class DynmapPlugin
@SubscribeEvent @SubscribeEvent
public void onPlayerChangedDimension(PlayerChangedDimensionEvent event) { public void onPlayerChangedDimension(PlayerChangedDimensionEvent event) {
if(!core_enabled) return; if(!core_enabled) return;
getOrAddPlayer((ServerPlayer)event.getPlayer()); // Freshen player object reference getOrAddPlayer((ServerPlayer)event.getEntity()); // Freshen player object reference
} }
@SubscribeEvent @SubscribeEvent
public void onPlayerRespawn(PlayerRespawnEvent event) { public void onPlayerRespawn(PlayerRespawnEvent event) {
if(!core_enabled) return; if(!core_enabled) return;
getOrAddPlayer((ServerPlayer)event.getPlayer()); // Freshen player object reference getOrAddPlayer((ServerPlayer)event.getEntity()); // Freshen player object reference
} }
} }
private PlayerTracker playerTracker = null; private PlayerTracker playerTracker = null;
@ -1672,9 +1672,9 @@ public class DynmapPlugin
public class WorldTracker { public class WorldTracker {
@SubscribeEvent(priority=EventPriority.LOWEST) @SubscribeEvent(priority=EventPriority.LOWEST)
public void handleWorldLoad(WorldEvent.Load event) { public void handleWorldLoad(LevelEvent.Load event) {
if(!core_enabled) return; if(!core_enabled) return;
LevelAccessor w = event.getWorld(); LevelAccessor w = event.getLevel();
if(!(w instanceof ServerLevel)) return; if(!(w instanceof ServerLevel)) return;
final ForgeWorld fw = getWorld((ServerLevel)w); final ForgeWorld fw = getWorld((ServerLevel)w);
// This event can be called from off server thread, so push processing there // This event can be called from off server thread, so push processing there
@ -1686,9 +1686,9 @@ public class DynmapPlugin
}, 0); }, 0);
} }
@SubscribeEvent(priority=EventPriority.LOWEST) @SubscribeEvent(priority=EventPriority.LOWEST)
public void handleWorldUnload(WorldEvent.Unload event) { public void handleWorldUnload(LevelEvent.Unload event) {
if(!core_enabled) return; if(!core_enabled) return;
LevelAccessor w = event.getWorld(); LevelAccessor w = event.getLevel();
if(!(w instanceof ServerLevel)) return; if(!(w instanceof ServerLevel)) return;
final ForgeWorld fw = getWorld((ServerLevel)w); final ForgeWorld fw = getWorld((ServerLevel)w);
if(fw != null) { if(fw != null) {
@ -1711,7 +1711,7 @@ public class DynmapPlugin
public void handleChunkLoad(ChunkEvent.Load event) { public void handleChunkLoad(ChunkEvent.Load event) {
if(!onchunkgenerate) return; if(!onchunkgenerate) return;
LevelAccessor w = event.getWorld(); LevelAccessor w = event.getLevel();
if(!(w instanceof ServerLevel)) return; if(!(w instanceof ServerLevel)) return;
ChunkAccess c = event.getChunk(); ChunkAccess c = event.getChunk();
if ((c != null) && (c.getStatus() == ChunkStatus.FULL) && (c instanceof LevelChunk)) { if ((c != null) && (c.getStatus() == ChunkStatus.FULL) && (c instanceof LevelChunk)) {
@ -1725,7 +1725,7 @@ public class DynmapPlugin
public void handleChunkUnload(ChunkEvent.Unload event) { public void handleChunkUnload(ChunkEvent.Unload event) {
if(!onchunkgenerate) return; if(!onchunkgenerate) return;
LevelAccessor w = event.getWorld(); LevelAccessor w = event.getLevel();
if(!(w instanceof ServerLevel)) return; if(!(w instanceof ServerLevel)) return;
ChunkAccess c = event.getChunk(); ChunkAccess c = event.getChunk();
if (c != null) { if (c != null) {
@ -1759,7 +1759,7 @@ public class DynmapPlugin
public void handleChunkDataSave(ChunkDataEvent.Save event) { public void handleChunkDataSave(ChunkDataEvent.Save event) {
if(!onchunkgenerate) return; if(!onchunkgenerate) return;
LevelAccessor w = event.getWorld(); LevelAccessor w = event.getLevel();
if(!(w instanceof ServerLevel)) return; if(!(w instanceof ServerLevel)) return;
ChunkAccess c = event.getChunk(); ChunkAccess c = event.getChunk();
if (c != null) { if (c != null) {
@ -1797,7 +1797,7 @@ public class DynmapPlugin
if(!core_enabled) return; if(!core_enabled) return;
if(!onblockchange) return; if(!onblockchange) return;
BlockUpdateRec r = new BlockUpdateRec(); BlockUpdateRec r = new BlockUpdateRec();
r.w = event.getWorld(); r.w = event.getLevel();
if(!(r.w instanceof ServerLevel)) return; // band-aid to prevent errors in unsupported 'running in client' scenario if(!(r.w instanceof ServerLevel)) return; // band-aid to prevent errors in unsupported 'running in client' scenario
ForgeWorld fw = getWorld((ServerLevel)r.w, false); ForgeWorld fw = getWorld((ServerLevel)r.w, false);
if (fw == null) return; if (fw == null) return;