Skip to content

Commit

Permalink
remove repeated string lowercasing during ticks
Browse files Browse the repository at this point in the history
  • Loading branch information
thiakil authored and pupnewfster committed May 18, 2021
1 parent 962698e commit 6bbb1ab
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
Expand Up @@ -2,6 +2,8 @@

import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;

import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
Expand All @@ -18,6 +20,7 @@ public class MultiblockManager<T extends MultiblockData> {
private static final Set<MultiblockManager<?>> managers = new ObjectOpenHashSet<>();

private final String name;
private final String nameLower;

private final Supplier<MultiblockCache<T>> cacheSupplier;
private final Supplier<IStructureValidator<T>> validatorSupplier;
Expand All @@ -29,6 +32,7 @@ public class MultiblockManager<T extends MultiblockData> {

public MultiblockManager(String name, Supplier<MultiblockCache<T>> cacheSupplier, Supplier<IStructureValidator<T>> validatorSupplier) {
this.name = name;
this.nameLower = name.toLowerCase(Locale.ROOT);
this.cacheSupplier = cacheSupplier;
this.validatorSupplier = validatorSupplier;
managers.add(this);
Expand All @@ -46,6 +50,10 @@ public String getName() {
return name;
}

public String getNameLower() {
return nameLower;
}

@Nullable
public static UUID getMultiblockID(TileEntityMultiblock<?> tile) {
return tile.getMultiblock().inventoryID;
Expand Down
Expand Up @@ -13,6 +13,6 @@ public TileEntityStructuralGlass() {

@Override
public boolean canInterface(MultiblockManager<?> manager) {
return !manager.getName().toLowerCase(Locale.ROOT).contains("reactor");
return !manager.getNameLower().contains("reactor");
}
}
Expand Up @@ -2,7 +2,6 @@

import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Nonnull;
Expand Down Expand Up @@ -102,7 +101,7 @@ protected void onUpdateServer() {
Structure structure = entry.getValue();
if (structure.isValid()) {
if (activeMultiblock == null && structure.getController() != null && getMultiblockData(structure).isFormed()) {
activeMultiblock = entry.getKey().getName().toLowerCase(Locale.ROOT);
activeMultiblock = entry.getKey().getNameLower();
}
} else {
iterator.remove();
Expand All @@ -114,7 +113,7 @@ protected void onUpdateServer() {
for (Map.Entry<MultiblockManager<?>, Structure> entry : structures.entrySet()) {
Structure structure = entry.getValue();
if (structure.getController() != null && getMultiblockData(structure).isFormed()) {
activeMultiblock = entry.getKey().getName().toLowerCase(Locale.ROOT);
activeMultiblock = entry.getKey().getNameLower();
break;
}
}
Expand All @@ -133,7 +132,7 @@ public ActionResultType onActivate(PlayerEntity player, Hand hand, ItemStack sta
IMultiblock<?> master = structure.getController();
if (master != null) {
MultiblockData data = getMultiblockData(structure);
if (data.isFormed() && structuralGuiAccessAllowed(entry.getKey().getName().toLowerCase(Locale.ROOT))) {
if (data.isFormed() && structuralGuiAccessAllowed(entry.getKey().getNameLower())) {
// make sure this block is on the structure first
if (data.getBounds().getRelativeLocation(getBlockPos()).isWall()) {
return master.onActivate(player, hand, stack);
Expand Down

0 comments on commit 6bbb1ab

Please sign in to comment.