Skip to content

Commit 0a7b33e

Browse files
committed
Clean up unused test server code, remove unused recipeblocks toTemplate
1 parent 2c60e3a commit 0a7b33e

File tree

2 files changed

+1
-83
lines changed

2 files changed

+1
-83
lines changed

src/main/java/dev/compactmods/crafting/recipes/blocks/RecipeBlocks.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import net.minecraft.util.math.vector.Vector3d;
1212
import net.minecraft.util.math.vector.Vector3i;
1313
import net.minecraft.world.IBlockReader;
14-
import net.minecraft.world.gen.feature.template.Template;
1514

1615
public class RecipeBlocks implements IRecipeBlocks {
1716

@@ -163,33 +162,6 @@ public IRecipeBlocks offset(Vector3i amount) {
163162
copy.filledBounds = copy.filledBounds.move(new Vector3d(amount.getX(), amount.getY(), amount.getZ()));
164163
copy.sourceBounds = copy.sourceBounds.move(new BlockPos(amount));
165164

166-
// final Map<BlockPos, BlockState> statesRelocated = states.entrySet().stream()
167-
// .map(e -> Pair.of(e.getKey().offset(amount), e.getValue()))
168-
// .collect(Collectors.toMap(Pair::getFirst, Pair::getSecond));
169-
//
170-
// copy.states.clear();
171-
// copy.states.putAll(statesRelocated);
172-
//
173-
// final Set<BlockPos> unmatched = unmatchedStates.stream()
174-
// .map(b -> b.offset(amount))
175-
// .map(BlockPos::immutable)
176-
// .collect(Collectors.toSet());
177-
//
178-
// copy.unmatchedStates.clear();
179-
// copy.unmatchedStates.addAll(unmatched);
180-
//
181-
// final Map<BlockPos, String> relocated = copy.lookup.components.entrySet()
182-
// .stream()
183-
// .map(e -> Pair.of(e.getKey().offset(amount), e.getValue()))
184-
// .collect(Collectors.toMap(Pair::getFirst, Pair::getSecond));
185-
//
186-
// copy.lookup.components.clear();
187-
// copy.lookup.components.putAll(relocated);
188-
189165
return copy;
190166
}
191-
192-
public Template toTemplate() {
193-
return null;
194-
}
195167
}

src/test/java/dev/compactmods/crafting/tests/ServerEventListener.java

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,26 @@
11
package dev.compactmods.crafting.tests;
22

33
import java.io.File;
4-
import java.nio.file.Path;
5-
import java.nio.file.Paths;
6-
import java.util.HashMap;
7-
import java.util.List;
8-
import java.util.Map;
94
import java.util.concurrent.ExecutionException;
10-
import com.google.common.collect.ImmutableMap;
115
import com.google.common.collect.ImmutableSet;
126
import dev.compactmods.crafting.CompactCrafting;
13-
import dev.compactmods.crafting.Registration;
14-
import dev.compactmods.crafting.recipes.MiniaturizationRecipe;
15-
import dev.compactmods.crafting.recipes.setup.RecipeBase;
16-
import dev.compactmods.crafting.tests.recipes.util.RecipeTestUtil;
177
import net.minecraft.entity.player.PlayerEntity;
18-
import net.minecraft.item.crafting.IRecipe;
19-
import net.minecraft.item.crafting.IRecipeType;
20-
import net.minecraft.item.crafting.RecipeManager;
218
import net.minecraft.resources.FolderPackFinder;
229
import net.minecraft.resources.IPackNameDecorator;
2310
import net.minecraft.resources.ResourcePackList;
2411
import net.minecraft.server.MinecraftServer;
2512
import net.minecraft.server.management.PlayerList;
26-
import net.minecraft.util.ResourceLocation;
2713
import net.minecraftforge.event.entity.player.PlayerEvent;
2814
import net.minecraftforge.eventbus.api.SubscribeEvent;
2915
import net.minecraftforge.fml.common.Mod;
30-
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
3116
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
3217

3318
@Mod.EventBusSubscriber(modid = CompactCrafting.MOD_ID)
3419
public class ServerEventListener {
3520

3621
@SubscribeEvent
3722
public static void onServerStarted(final FMLServerStartedEvent evt) {
38-
3923
final MinecraftServer server = evt.getServer();
40-
// final File root = server.getServerDirectory().getParentFile();
41-
// server.getPackRepository().addPackFinder(new FolderPackFinder());
42-
43-
final List<RecipeBase> miniBefore = server.getRecipeManager().getAllRecipesFor(Registration.MINIATURIZATION_RECIPE_TYPE);
4424

4525
// Add "test/resources" as a resource pack to the pack repository
4626
final ResourcePackList packs = server.getPackRepository();
@@ -55,46 +35,12 @@ public static void onServerStarted(final FMLServerStartedEvent evt) {
5535
.build();
5636

5737
packs.setSelected(toSelect);
38+
5839
try {
5940
server.reloadResources(packs.getSelectedIds()).get();
6041
} catch (InterruptedException | ExecutionException e) {
6142
CompactCrafting.LOGGER.error("Failed to reload test resource packs.", e);
6243
}
63-
64-
final List<RecipeBase> miniAfter = server.getRecipeManager().getAllRecipesFor(Registration.MINIATURIZATION_RECIPE_TYPE);
65-
// hackyRecipeLoad(server);
66-
CompactCrafting.LOGGER.debug("Added test miniaturization recipes.");
67-
}
68-
69-
private static void hackyRecipeLoad(MinecraftServer server) {
70-
final RecipeManager recipeManager = server.overworld().getRecipeManager();
71-
final ImmutableMap<IRecipeType<?>, Map<ResourceLocation, IRecipe<?>>> recipes = ObfuscationReflectionHelper
72-
.getPrivateValue(RecipeManager.class, recipeManager, "recipes");
73-
final HashMap<IRecipeType<?>, Map<ResourceLocation, IRecipe<?>>> moreRecipes = new HashMap<>();
74-
75-
final HashMap<ResourceLocation, IRecipe<?>> miniRecipes = new HashMap<>();
76-
final Path pf = new File(System.getenv("TEST_RESOURCES")).toPath();
77-
final Path testRecipes = pf.resolve(Paths.get("data", "compactcrafting", "recipes"));
78-
79-
final File recipeDir = testRecipes.toFile();
80-
final String dp = recipeDir.getAbsolutePath();
81-
if (!recipeDir.exists())
82-
return;
83-
84-
final File[] files = recipeDir.listFiles();
85-
if (files == null)
86-
return;
87-
88-
for (File f : files) {
89-
final MiniaturizationRecipe recipe = RecipeTestUtil.getRecipeFromFile(f.getAbsolutePath());
90-
if (recipe != null)
91-
miniRecipes.put(recipe.getRecipeIdentifier(), recipe);
92-
}
93-
94-
moreRecipes.put(Registration.MINIATURIZATION_RECIPE_TYPE, miniRecipes);
95-
moreRecipes.putAll(recipes);
96-
97-
ObfuscationReflectionHelper.setPrivateValue(RecipeManager.class, recipeManager, moreRecipes, "recipes");
9844
}
9945

10046
@SubscribeEvent

0 commit comments

Comments
 (0)