Skip to content

Commit 1689465

Browse files
committed
Enable alpha-warning (minus readme details) and fix game test for unloading chunks
1 parent a33af9d commit 1689465

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ forge_version_range=[20.6.113-beta,)
1717
minecraft_version_range=[1.21-rc1]
1818
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1919
# options are: alpha, beta, release
20-
release_type=beta
20+
release_type=alpha
2121

2222
#JUnit/Testing dependencies
2323
junit_version=5.10.2

src/datagen/main/java/mekanism/common/recipe/compat/FarmersDelightRecipeProvider.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mekanism.common.recipe.compat;
1+
/*package mekanism.common.recipe.compat;
22
33
import mekanism.api.annotations.NothingNullByDefault;
44
import mekanism.api.datagen.recipe.builder.SawmillRecipeBuilder;
@@ -11,7 +11,6 @@
1111
import net.minecraft.world.item.Items;
1212
import vectorwing.farmersdelight.common.registry.ModItems;
1313
14-
//TODO - 1.21: Remove this if we want to release before Farmers delight so that our generated recipes go away as our syntax has changed
1514
@NothingNullByDefault
1615
public class FarmersDelightRecipeProvider extends CompatRecipeProvider {
1716
@@ -119,4 +118,4 @@ private void addPrecisionSawmillRecipes(RecipeOutput consumer, String basePath)
119118
).addCondition(modLoaded)
120119
.build(consumer, Mekanism.rl(basePath + "cod_slice"));
121120
}
122-
}
121+
}*/

src/datagen/main/java/mekanism/common/recipe/impl/MekanismRecipeProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import mekanism.common.recipe.builder.MekDataShapedRecipeBuilder;
2323
import mekanism.common.recipe.compat.AE2RecipeProvider;
2424
import mekanism.common.recipe.compat.BiomesOPlentyRecipeProvider;
25-
import mekanism.common.recipe.compat.FarmersDelightRecipeProvider;
2625
import mekanism.common.recipe.pattern.Pattern;
2726
import mekanism.common.recipe.pattern.RecipePattern;
2827
import mekanism.common.recipe.pattern.RecipePattern.DoubleLine;
@@ -86,7 +85,7 @@ public MekanismRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.
8685
//Mod Compat Recipe providers
8786
checkCompat("ae2", AE2RecipeProvider::new);
8887
checkCompat("biomesoplenty", BiomesOPlentyRecipeProvider::new);
89-
checkCompat("farmersdelight", FarmersDelightRecipeProvider::new);
88+
//checkCompat("farmersdelight", FarmersDelightRecipeProvider::new);
9089
}
9190

9291
private void checkCompat(String modid, Function<String, ISubRecipeProvider> providerCreator) {

src/gameTest/java/mekanism/common/tests/network/TransmitterNetworkTest.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
import net.minecraft.core.Direction.AxisDirection;
2020
import net.minecraft.gametest.framework.GameTest;
2121
import net.minecraft.server.level.ChunkHolder;
22-
import net.minecraft.server.level.ChunkLevel;
2322
import net.minecraft.server.level.ChunkMap;
2423
import net.minecraft.server.level.DistanceManager;
2524
import net.minecraft.world.level.ChunkPos;
2625
import net.minecraft.world.level.block.Blocks;
27-
import net.minecraft.world.level.chunk.status.ChunkStatus;
2826
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
2927
import net.neoforged.neoforge.event.level.ChunkEvent;
3028
import net.neoforged.testframework.DynamicTest;
@@ -188,13 +186,8 @@ public int updateChunkLoading(MekGameTestHelper helper, boolean load, int level)
188186
if (holder == null) {//Should never happen unless start value was unloaded
189187
helper.fail("Error loading chunk", relativePos);
190188
} else {
191-
//And ensure we schedule it based on the status (in general this should be ChunkStatus.FULL)
192-
ChunkStatus chunkStatus = ChunkLevel.generationStatus(holder.getTicketLevel());
193-
if (chunkStatus == null) {
194-
helper.fail("Error getting chunk status", relativePos);
195-
} else {
196-
chunkMap.scheduleGenerationTask(chunkStatus, absolutePos);
197-
}
189+
//And force all updates to run to make the chunk have the scheduling we want it to
190+
distanceManager.runAllUpdates(chunkMap);
198191
}
199192
} else {
200193
//If it is currently loaded, queue it for unload

src/main/java/mekanism/common/CommonPlayerTracker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public CommonPlayerTracker() {
4343
public void onPlayerLoginEvent(PlayerLoggedInEvent event) {
4444
Player player = event.getEntity();
4545
if (!player.level().isClientSide) {
46-
//player.sendSystemMessage(ALPHA_WARNING);
46+
player.sendSystemMessage(ALPHA_WARNING);
4747
MekanismCriteriaTriggers.LOGGED_IN.value().trigger((ServerPlayer) player);
4848
}
4949
}

0 commit comments

Comments
 (0)