MinecraftMods/Thresholds
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a compatibility workaround for a reported problem in discord.

Browse source
This commit is contained in:
zontreck 2024-04-07 23:36:07 -07:00
parent 9b73884157
commit 4a7a8dd202
18 changed files with 2483 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -170,6 +170,8 @@ dependencies {
runtimeOnly fg.deobf("curse.maven:jei-238222:5101366") runtimeOnly fg.deobf("curse.maven:jei-238222:5101366")
runtimeOnly fg.deobf("curse.maven:nbtedit-reborn-678133:5082493") runtimeOnly fg.deobf("curse.maven:nbtedit-reborn-678133:5082493")
runtimeOnly fg.deobf("curse.maven:spawn-structures-964113:5113737")
// Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")

2
gradle.properties
View file

@ -48,7 +48,7 @@ mod_name=Thresholds
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=GPLv3 mod_license=GPLv3
# The mod version. See https://semver.org/ # The mod version. See https://semver.org/
mod_version=1201.4.040324.0020 mod_version=1201.4.040724.2332
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources. # This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

38
src/main/java/dev/zontreck/otemod/OTEMod.java
View file

@ -79,13 +79,9 @@ public class OTEMod
public static final String MOD_ID = "otemod"; public static final String MOD_ID = "otemod";
//public static List<TeleportContainer> TeleportRegistry = new ArrayList<>(); //public static List<TeleportContainer> TeleportRegistry = new ArrayList<>();
public static MinecraftServer THE_SERVER;
public static boolean ALIVE=false; public static boolean ALIVE=false;
public static boolean HEALER_WAIT=true; // Only on loading finish should this unlock
public static Thread HEALER_THREAD;
public static boolean DEVELOPER=false; public static boolean DEVELOPER=false;
private static Thread MasterThread;
public static String OTEPrefix = ""; public static String OTEPrefix = "";
public static String ONLY_PLAYER = ""; public static String ONLY_PLAYER = "";
@ -220,36 +216,6 @@ public class OTEMod
OTEMod.ALIVE=true; OTEMod.ALIVE=true;
//HealerQueue.Initialize(); // Set up the queue //HealerQueue.Initialize(); // Set up the queue
// Set up the repeating task to expire a TeleportContainer
OTEMod.THE_SERVER = event.getServer();
OTEMod.MasterThread = new Thread(new Runnable(){
public void run()
{
while(OTEMod.ALIVE){
// Check if the teleports have expired
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
//e.printStackTrace();
}
/*Iterator<TeleportContainer> containers = OTEMod.TeleportRegistry.iterator();
while(containers.hasNext())
{
TeleportContainer cont = containers.next();
Component expire = new TextComponent(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE+" Teleport request has expired");
ChatServerOverride.broadcastTo(cont.FromPlayer, expire, OTEMod.THE_SERVER);
ChatServerOverride.broadcastTo(cont.ToPlayer, expire, OTEMod.THE_SERVER);
containers.remove();
}*/
}
OTEMod.LOGGER.info("Tearing down OTEMod teleport queue - The server is going down");
}
});
OTEMod.MasterThread.start();
} }
@ -282,7 +248,6 @@ public class OTEMod
public void onStop(final ServerStoppingEvent ev) public void onStop(final ServerStoppingEvent ev)
{ {
OTEMod.ALIVE=false; // Tear down all looping threads that will watch this OTEMod.ALIVE=false; // Tear down all looping threads that will watch this
OTEMod.MasterThread.interrupt();
} }
@ -305,9 +270,6 @@ public class OTEMod
MenuScreens.register(ModMenuTypes.COMPRESSION_CHAMBER.get(), CompressionChamberScreen::new); MenuScreens.register(ModMenuTypes.COMPRESSION_CHAMBER.get(), CompressionChamberScreen::new);
MenuScreens.register(ModMenuTypes.UNCRAFTER.get(), UncrafterScreen::new); MenuScreens.register(ModMenuTypes.UNCRAFTER.get(), UncrafterScreen::new);
//ItemBlockRenderTypes.setRenderLayer(ModBlocks.AURORA_DOOR.get(), RenderType.translucent());
//EntityRenderers.register(ModEntityTypes.POSSUM.get(), PossumRenderer::new);
} }

3
src/main/java/dev/zontreck/otemod/commands/items/ShareItemInChatCommand.java
View file

@ -15,6 +15,7 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.AirItem; import net.minecraft.world.item.AirItem;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraftforge.server.ServerLifecycleHooks;
public class ShareItemInChatCommand { public class ShareItemInChatCommand {
@ -51,7 +52,7 @@ public class ShareItemInChatCommand {
Style style = Style.EMPTY.withFont(Style.DEFAULT_FONT); Style style = Style.EMPTY.withFont(Style.DEFAULT_FONT);
component = component.withStyle(style.withHoverEvent(HoverTip.getItem(is))); component = component.withStyle(style.withHoverEvent(HoverTip.getItem(is)));
ChatHelpers.broadcast(component, OTEMod.THE_SERVER); ChatHelpers.broadcast(component, ServerLifecycleHooks.getCurrentServer());
}else { }else {
return 1; return 1;

7
src/main/java/dev/zontreck/otemod/commands/zschem/LoadSchem.java
View file

@ -21,6 +21,7 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.fml.loading.FMLConfig; import net.minecraftforge.fml.loading.FMLConfig;
import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.server.ServerLifecycleHooks;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -117,12 +118,12 @@ public class LoadSchem {
} }
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!ZSchem loaded from disk!"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!ZSchem loaded from disk!"), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }
} }
} }
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro("!Dark_Red! You must set the first position"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro("!Dark_Red! You must set the first position"), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }
@ -133,7 +134,7 @@ public class LoadSchem {
usage += "!gold! /loadzschem [string:name]"; usage += "!gold! /loadzschem [string:name]";
ServerPlayer play=(ServerPlayer)source.getEntity(); ServerPlayer play=(ServerPlayer)source.getEntity();
if(play==null)return 1; if(play==null)return 1;
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(usage), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(usage), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }
} }

7
src/main/java/dev/zontreck/otemod/commands/zschem/Place.java
View file

@ -12,6 +12,7 @@ import dev.zontreck.otemod.zschem.WorldProp;
import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands; import net.minecraft.commands.Commands;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.server.ServerLifecycleHooks;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -41,7 +42,7 @@ public class Place {
if(!MemoryHolder.hasPlayerCached(play)){ if(!MemoryHolder.hasPlayerCached(play)){
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first load the zschem!"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first load the zschem!"), ServerLifecycleHooks.getCurrentServer());
return 1; return 1;
} }
@ -62,13 +63,13 @@ public class Place {
}else { }else {
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first load the zschem!"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first load the zschem!"), ServerLifecycleHooks.getCurrentServer());
return 1; return 1;
} }
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!Enqueued!"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!Enqueued!"), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }

7
src/main/java/dev/zontreck/otemod/commands/zschem/PlaceAsAir.java
View file

@ -14,6 +14,7 @@ import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands; import net.minecraft.commands.Commands;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.server.ServerLifecycleHooks;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
@ -44,7 +45,7 @@ public class PlaceAsAir {
if(!MemoryHolder.hasPlayerCached(play)){ if(!MemoryHolder.hasPlayerCached(play)){
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first set the positions!"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first set the positions!"), ServerLifecycleHooks.getCurrentServer());
return 1; return 1;
} }
@ -69,13 +70,13 @@ public class PlaceAsAir {
}else { }else {
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first set the positions!"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first set the positions!"), ServerLifecycleHooks.getCurrentServer());
return 1; return 1;
} }
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!Enqueued!"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!Enqueued!"), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }

7
src/main/java/dev/zontreck/otemod/commands/zschem/SaveSchem.java
View file

@ -19,6 +19,7 @@ import net.minecraft.nbt.NbtIo;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.fml.loading.FMLConfig; import net.minecraftforge.fml.loading.FMLConfig;
import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.server.ServerLifecycleHooks;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -103,12 +104,12 @@ public class SaveSchem {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!ZSchem saved to disk!"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!ZSchem saved to disk!"), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }
} }
} }
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro("!Dark_Red! You must first set the positions"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro("!Dark_Red! You must first set the positions"), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }
@ -119,7 +120,7 @@ public class SaveSchem {
usage += "!gold! /savezschem [string:name]"; usage += "!gold! /savezschem [string:name]";
ServerPlayer play=(ServerPlayer)source.getEntity(); ServerPlayer play=(ServerPlayer)source.getEntity();
if(play==null)return 1; if(play==null)return 1;
ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(usage), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(usage), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }
} }

3
src/main/java/dev/zontreck/otemod/commands/zschem/SetPos1.java
View file

@ -12,6 +12,7 @@ import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands; import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.server.ServerLifecycleHooks;
public class SetPos1 { public class SetPos1 {
@ -37,7 +38,7 @@ public class SetPos1 {
MemoryHolder.setPos1(play, new Vector3(source.getPosition())); MemoryHolder.setPos1(play, new Vector3(source.getPosition()));
MemoryHolder.setLevel(play, source.getLevel()); MemoryHolder.setLevel(play, source.getLevel());
ChatHelpers.broadcastTo(play.getUUID(), Component.literal(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 1 set!")), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), Component.literal(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 1 set!")), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }

3
src/main/java/dev/zontreck/otemod/commands/zschem/SetPos2.java
View file

@ -12,6 +12,7 @@ import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands; import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.server.ServerLifecycleHooks;
public class SetPos2 { public class SetPos2 {
@ -37,7 +38,7 @@ public class SetPos2 {
MemoryHolder.setPos2(play, new Vector3(source.getPosition())); MemoryHolder.setPos2(play, new Vector3(source.getPosition()));
MemoryHolder.setLevel(play, source.getLevel()); MemoryHolder.setLevel(play, source.getLevel());
ChatHelpers.broadcastTo(play.getUUID(), Component.literal(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 2 set!")), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(play.getUUID(), Component.literal(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 2 set!")), ServerLifecycleHooks.getCurrentServer());
return 0; return 0;
} }

3
src/main/java/dev/zontreck/otemod/integrations/LuckPermsHelper.java
View file

@ -1,9 +1,6 @@
package dev.zontreck.otemod.integrations; package dev.zontreck.otemod.integrations;
import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.libzontreck.util.ChatHelpers; import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.chat.ChatServerOverride;
import dev.zontreck.otemod.implementation.Messages; import dev.zontreck.otemod.implementation.Messages;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;

7
src/main/java/dev/zontreck/otemod/items/VaultItem.java
View file

@ -13,6 +13,7 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraftforge.server.ServerLifecycleHooks;
public class VaultItem extends Item public class VaultItem extends Item
{ {
@ -49,12 +50,12 @@ public class VaultItem extends Item
{ {
if(p.available_vaults >= ServerConfig.general.maxVaults) if(p.available_vaults >= ServerConfig.general.maxVaults)
{ {
ChatHelpers.broadcastTo(pPlayer.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You cannot activate anymore vaults due to the maximum set by the server admin"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(pPlayer.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You cannot activate anymore vaults due to the maximum set by the server admin"), ServerLifecycleHooks.getCurrentServer());
return InteractionResultHolder.pass(is); return InteractionResultHolder.pass(is);
} else { } else {
p.available_vaults++; p.available_vaults++;
p.commit(); p.commit();
ChatHelpers.broadcastTo(pPlayer.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!You now have "+String.valueOf(p.available_vaults)+" available vaults"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(pPlayer.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!You now have "+String.valueOf(p.available_vaults)+" available vaults"), ServerLifecycleHooks.getCurrentServer());
pPlayer.setItemInHand(pUsedHand, new ItemStack(Items.AIR)); pPlayer.setItemInHand(pUsedHand, new ItemStack(Items.AIR));
return InteractionResultHolder.consume(is); return InteractionResultHolder.consume(is);
@ -62,7 +63,7 @@ public class VaultItem extends Item
}else { }else {
p.available_vaults++; p.available_vaults++;
p.commit(); p.commit();
ChatHelpers.broadcastTo(pPlayer.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!You now have "+String.valueOf(p.available_vaults)+" available vaults"), OTEMod.THE_SERVER); ChatHelpers.broadcastTo(pPlayer.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!You now have "+String.valueOf(p.available_vaults)+" available vaults"), ServerLifecycleHooks.getCurrentServer());
pPlayer.setItemInHand(pUsedHand, new ItemStack(Items.AIR)); pPlayer.setItemInHand(pUsedHand, new ItemStack(Items.AIR));
return InteractionResultHolder.consume(is); return InteractionResultHolder.consume(is);

25
src/main/resources/data/otemod/dimension/builder.json
View file

@ -1,26 +1,11 @@
{ {
"type": "otemod:builder", "type": "otemod:builder",
"generator": { "generator": {
"type": "minecraft:flat", "type": "minecraft:noise",
"settings": { "settings": "otemod:builder",
"biome": "minecraft:plains", "biome_source": {
"lakes": false, "type": "minecraft:multi_noise",
"features": false, "preset": "minecraft:overworld"
"layers": [
{
"block": "minecraft:bedrock",
"height": 1
},
{
"block": "minecraft:stone",
"height": 2
},
{
"block": "minecraft:grass_block",
"height": 3
}
],
"structure_overrides": "minecraft:villages"
} }
} }
} }

2
src/main/resources/data/otemod/dimension_type/builder.json
View file

@ -1,6 +1,6 @@
{ {
"ultrawarm": false, "ultrawarm": false,
"natural": true, "natural": false,
"piglin_safe": false, "piglin_safe": false,
"respawn_anchor_works": false, "respawn_anchor_works": false,
"bed_works": false, "bed_works": false,

BIN
src/main/resources/data/otemod/structures/thresholds/lvl1/chute.nbt
View file

Binary file not shown.

BIN
src/main/resources/data/otemod/structures/thresholds/lvl1/entry.nbt
View file

Binary file not shown.

2448
src/main/resources/data/otemod/worldgen/noise_settings/builder.json Normal file
View file

File diff suppressed because it is too large Load diff

11
src/main/resources/otemod.mixins.json
View file

@ -1,11 +0,0 @@
{
"required": true,
"package": "dev.zontreck.otemod.mixins",
"compatibilityLevel": "JAVA_17",
"refmap": "otemod.refmap.json",
"mixins": [
],
"injectors": {
"defaultRequire": 1
}
}