Merged 1.7.4 release

README.md

@@ -9,7 +9,7 @@
 - [Modrinth](https://modrinth.com/mod/majruszs-progressive-difficulty)
 
 ## Current Mod Releases (Source Code)
-- [v1.7.3 for Minecraft 1.19.3](https://github.com/Majrusz/MajruszsProgressiveDifficultyMod/tree/1.19.X/)
+- [v1.7.4 for Minecraft 1.19.3](https://github.com/Majrusz/MajruszsProgressiveDifficultyMod/tree/1.19.X/)
 - [v1.4.4 for Minecraft 1.18.2](https://github.com/Majrusz/MajruszsProgressiveDifficultyMod/tree/1.18.X/) *(not supported anymore)*
 - [v1.3.0 for Minecraft 1.17.1](https://github.com/Majrusz/MajruszsProgressiveDifficultyMod/tree/1.17.1/) *(not supported anymore)*
 - [v1.1.0 for Minecraft 1.16.4](https://github.com/Majrusz/MajruszsProgressiveDifficultyMod/tree/1.16.4/) *(not supported anymore)*

build.gradle

@@ -14,7 +14,7 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 
-version = '1.7.3'
+version = '1.7.4'
 group = 'com.majruszsdifficulty'
 archivesBaseName = 'majruszs-difficulty-1.19.2'
 
@@ -76,7 +76,7 @@ repositories {
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.19.2-43.2.0'
-    implementation fg.deobf( 'com.mlib:majrusz-library-1.19.2:3.3.0' )
+    implementation fg.deobf( 'com.mlib:majrusz-library-1.19.2:4.0.0' )
 }
 
 // Example for how to get properties into the manifest for reading at runtime.

src/main/java/com/majruszsdifficulty/GameDataSaver.java

@@ -1,6 +1,7 @@
 package com.majruszsdifficulty;
 
-import com.majruszsdifficulty.gamemodifiers.list.IncreaseGameStage;
+import com.majruszsdifficulty.gamestage.handlers.GameStageIncreaser;
+import com.majruszsdifficulty.gamestage.GameStage;
 import com.majruszsdifficulty.treasurebags.TreasureBagProgressManager;
 import com.majruszsdifficulty.undeadarmy.Config;
 import com.majruszsdifficulty.undeadarmy.UndeadArmyManager;
@@ -15,7 +16,7 @@ public class GameDataSaver extends SavedData {
 	public GameDataSaver( ServerLevel overworld ) {
 		this.data = new Data( overworld );
 
-		GameStage.changeStage( IncreaseGameStage.getDefaultGameStage(), null );
+		GameStage.changeStage( GameStageIncreaser.getDefaultGameStage(), null );
 	}
 
 	public GameDataSaver( ServerLevel overworld, CompoundTag tag ) {

src/main/java/com/majruszsdifficulty/PacketHandler.java

@@ -18,9 +18,9 @@ public class PacketHandler {
 	public static void registerPacket( final FMLCommonSetupEvent event ) {
 		CHANNEL = NetworkRegistry.newSimpleChannel( Registries.getLocation( "main" ), ()->PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals );
 		SerializableStructure.register( CHANNEL, 0, TankEntity.SkillMessage.class, TankEntity.SkillMessage::new );
-		CHANNEL.registerMessage( 1, CursedArmorEntity.AssembleMessage.class, CursedArmorEntity.AssembleMessage::encode, CursedArmorEntity.AssembleMessage::new, CursedArmorEntity.AssembleMessage::handle );
+		SerializableStructure.register( CHANNEL, 1, CursedArmorEntity.AssembleMessage.class, CursedArmorEntity.AssembleMessage::new );
 		SerializableStructure.register( CHANNEL, 2, LootProgressData.class, LootProgressData::new );
-		CHANNEL.registerMessage( 3, BleedingEffect.BloodMessage.class, BleedingEffect.BloodMessage::encode, BleedingEffect.BloodMessage::new, BleedingEffect.BloodMessage::handle );
+		SerializableStructure.register( CHANNEL, 3, BleedingEffect.BloodMessage.class, BleedingEffect.BloodMessage::new );
 		SerializableStructure.register( CHANNEL, 4, CerberusEntity.SkillMessage.class, CerberusEntity.SkillMessage::new );
 		SerializableStructure.register( CHANNEL, 5, CerberusEntity.TargetMessage.class, CerberusEntity.TargetMessage::new );
 	}

src/main/java/com/majruszsdifficulty/Registries.java

@@ -16,7 +16,7 @@
 import com.majruszsdifficulty.undeadarmy.UndeadArmyManager;
 import com.mlib.Utility;
 import com.mlib.annotations.AnnotationHandler;
-import com.mlib.gamemodifiers.GameModifier;
+import com.mlib.gamemodifiers.ModConfigs;
 import com.mlib.items.CreativeModeTabHelper;
 import com.mlib.registries.RegistryHelper;
 import com.mlib.triggers.BasicTrigger;
@@ -47,7 +47,6 @@
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.level.storage.DimensionDataStorage;
 import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType;
 import net.minecraftforge.common.ForgeSpawnEggItem;
 import net.minecraftforge.common.MinecraftForge;
@@ -71,17 +70,16 @@
 import static com.majruszsdifficulty.MajruszsDifficulty.MOD_ID;
 import static com.majruszsdifficulty.MajruszsDifficulty.SERVER_CONFIG;
 import static net.minecraft.core.Registry.LOOT_FUNCTION_REGISTRY;
-import static net.minecraft.core.Registry.LOOT_FUNCTION_TYPE;
 
 public class Registries {
 	private static final RegistryHelper HELPER = new RegistryHelper( MajruszsDifficulty.MOD_ID );
 
 	static {
-		GameModifier.addNewGroup( SERVER_CONFIG, Modifiers.DEFAULT ).name( "GameModifiers" );
-		GameModifier.addNewGroup( SERVER_CONFIG, Modifiers.UNDEAD_ARMY ).name( "UndeadArmy" );
-		GameModifier.addNewGroup( SERVER_CONFIG, Modifiers.GAME_STAGE ).name( "GameStage" );
-		GameModifier.addNewGroup( SERVER_CONFIG, Modifiers.TREASURE_BAG ).name( "TreasureBag" );
-		GameModifier.addNewGroup( SERVER_CONFIG, Modifiers.MOBS ).name( "Mobs" );
+		ModConfigs.init( SERVER_CONFIG, Groups.DEFAULT ).name( "GameModifiers" );
+		ModConfigs.init( SERVER_CONFIG, Groups.UNDEAD_ARMY ).name( "UndeadArmy" );
+		ModConfigs.init( SERVER_CONFIG, Groups.GAME_STAGE ).name( "GameStage" );
+		ModConfigs.init( SERVER_CONFIG, Groups.TREASURE_BAG ).name( "TreasureBag" );
+		ModConfigs.init( SERVER_CONFIG, Groups.MOBS ).name( "Mobs" );
 	}
 
 	// Groups
@@ -191,7 +189,7 @@ static Supplier< SpawnEggItem > createEggSupplier( Supplier< ? extends EntityTyp
 	public static final GameStageTrigger GAME_STATE_TRIGGER = CriteriaTriggers.register( new GameStageTrigger() );
 	public static final TreasureBagTrigger TREASURE_BAG_TRIGGER = CriteriaTriggers.register( new TreasureBagTrigger() );
 	public static final BandageTrigger BANDAGE_TRIGGER = CriteriaTriggers.register( new BandageTrigger() );
-	public static final BasicTrigger BASIC_TRIGGER = BasicTrigger.createRegisteredInstance( HELPER );
+	public static final BasicTrigger BASIC_TRIGGER = HELPER.registerBasicTrigger();
 
 	// Sounds
 	public static final RegistryObject< SoundEvent > UNDEAD_ARMY_APPROACHING = register( "undead_army.approaching" );
@@ -330,7 +328,7 @@ private static ServerLevel getOverworld( LevelAccessor levelAccessor ) {
 		return levelAccessor.equals( overworld ) ? overworld : null;
 	}
 
-	public static class Modifiers {
+	public static class Groups {
 		public static final String DEFAULT = Registries.getLocationString( "default" );
 		public static final String UNDEAD_ARMY = Registries.getLocationString( "undead_army" );
 		public static final String GAME_STAGE = Registries.getLocationString( "game_stage" );

src/main/java/com/majruszsdifficulty/config/GameStageConfig.java

@@ -1,6 +1,6 @@
 package com.majruszsdifficulty.config;
 
-import com.majruszsdifficulty.GameStage;
+import com.majruszsdifficulty.gamestage.GameStage;
 import com.mlib.config.ConfigGroup;
 import com.mlib.config.ValueConfig;