Skip to content

Commit

Permalink
reduce usage of WTDefinition#of(String)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mari023 committed May 25, 2024
1 parent cbae123 commit 0b44e12
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import de.mari_023.ae2wtlib.wct.WCTMenu;
import de.mari_023.ae2wtlib.wet.WETMenu;
import de.mari_023.ae2wtlib.wut.WTDefinition;
import de.mari_023.ae2wtlib.wut.WTDefinitions;

@EmiEntrypoint
public class AE2wtlibEmiPlugin implements EmiPlugin {
Expand All @@ -22,6 +22,6 @@ public void register(EmiRegistry registry) {
registry.addRecipeHandler(WCTMenu.TYPE, new EmiUseCraftingRecipeHandler<>(WCTMenu.class));

registry.addWorkstation(VanillaEmiRecipeCategories.CRAFTING,
EmiStack.of(WTDefinition.of("crafting").universalTerminal()));
EmiStack.of(WTDefinitions.CRAFTING.universalTerminal()));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import mezz.jei.api.registration.IRecipeTransferRegistration;

import de.mari_023.ae2wtlib.AE2wtlib;
import de.mari_023.ae2wtlib.wut.WTDefinition;
import de.mari_023.ae2wtlib.wut.WTDefinitions;

@JeiPlugin
public class JEIPlugin implements IModPlugin {
Expand All @@ -27,7 +27,7 @@ public void registerRecipeTransferHandlers(IRecipeTransferRegistration registrat

@Override
public void registerRecipeCatalysts(IRecipeCatalystRegistration registry) {
registry.addRecipeCatalyst(WTDefinition.of("crafting").universalTerminal(),
registry.addRecipeCatalyst(WTDefinitions.CRAFTING.universalTerminal(),
RecipeTypes.CRAFTING);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import me.shedaniel.rei.plugin.common.BuiltinPlugin;

import de.mari_023.ae2wtlib.AE2wtlib;
import de.mari_023.ae2wtlib.wut.WTDefinition;
import de.mari_023.ae2wtlib.wut.WTDefinitions;

@REIPluginClient
public class REIPlugin implements REIClientPlugin {
Expand All @@ -19,6 +19,6 @@ public String getPluginProviderName() {
@Override
public void registerCategories(CategoryRegistry registry) {
registry.addWorkstations(BuiltinPlugin.CRAFTING,
EntryStacks.of(WTDefinition.of("crafting").universalTerminal()));
EntryStacks.of(WTDefinitions.CRAFTING.universalTerminal()));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import de.mari_023.ae2wtlib.terminal.WTMenuHost;
import de.mari_023.ae2wtlib.wct.magnet_card.MagnetHost;
import de.mari_023.ae2wtlib.wut.WTDefinition;
import de.mari_023.ae2wtlib.wut.WTDefinitions;
import de.mari_023.ae2wtlib.wut.WUTHandler;

public class CraftingTerminalHandler {
Expand Down Expand Up @@ -96,10 +96,10 @@ private WTMenuHost getMenuHost() {

@Nullable
public ItemMenuHostLocator getLocator() {
if (locator != null && WUTHandler.hasTerminal(locator.locateItem(player), WTDefinition.of("crafting")))
if (locator != null && WUTHandler.hasTerminal(locator.locateItem(player), WTDefinitions.CRAFTING))
return locator;
boolean locatorWasNotNull = locator != null;
locator = WUTHandler.findTerminal(player, WTDefinition.of("crafting"));
locator = WUTHandler.findTerminal(player, WTDefinitions.CRAFTING);

if (locator == null) {
invalidateCache();
Expand Down
17 changes: 6 additions & 11 deletions src/main/java/de/mari_023/ae2wtlib/wut/WTDefinition.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@ WTMenuHost create(ItemWT item, Player player, ItemMenuHostLocator locator,
BiConsumer<Player, ISubMenu> returnToMainMenu);
}

private static final Map<String, WTDefinition> wirelessTerminals = new HashMap<>();
static final List<WTDefinition> wirelessTerminalList = new ArrayList<>();

public static final Codec<WTDefinition> CODEC = Codec.STRING.comapFlatMap(s -> {
var terminal = ofOrNull(s);
var terminal = wirelessTerminals.get(s);
if (terminal == null)
return DataResult.error(() -> "WTDefinition " + s + " does not exist");
return DataResult.success(terminal);
}, WTDefinition::terminalName);
public static final StreamCodec<ByteBuf, WTDefinition> STREAM_CODEC = ByteBufCodecs.STRING_UTF8
.map(WTDefinition::of, WTDefinition::terminalName);

private static final Map<String, WTDefinition> wirelessTerminals = new HashMap<>();
static final List<WTDefinition> wirelessTerminalList = new ArrayList<>();

static void add(String terminalName, WTDefinition definition) {
wirelessTerminals.put(terminalName, definition);
wirelessTerminalList.add(definition);
Expand All @@ -65,13 +65,8 @@ public static Collection<WTDefinition> wirelessTerminals() {
return wirelessTerminals.values();
}

public static WTDefinition of(String name) {
return Objects.requireNonNull(ofOrNull(name));
}

@Nullable
public static WTDefinition ofOrNull(String name) {
return wirelessTerminals.get(name);
static WTDefinition of(String name) {
return Objects.requireNonNull(wirelessTerminals.get(name));
}

public static WTDefinition of(ItemStack stack) {
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/de/mari_023/ae2wtlib/wut/WTDefinitions.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package de.mari_023.ae2wtlib.wut;

public class WTDefinitions {
private WTDefinitions() {
}

public static WTDefinition CRAFTING = WTDefinition.of("crafting");
public static WTDefinition PATTERN_ENCODING = WTDefinition.of("pattern_encoding");
public static WTDefinition PATTERN_ACCESS = WTDefinition.of("pattern_access");
}

0 comments on commit 0b44e12

Please sign in to comment.