mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Apply suggestions from code review - 1
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
This commit is contained in:
parent
e80f137a79
commit
58fde5cbdf
@ -124,8 +124,8 @@ public class RecipeType implements Keyed {
|
||||
} else {
|
||||
SlimefunItem slimefunItem = SlimefunItem.getById(this.machine);
|
||||
|
||||
if (slimefunItem instanceof MultiBlockMachine multiBlockMachine) {
|
||||
multiBlockMachine.addRecipe(recipe, result);
|
||||
if (slimefunItem instanceof MultiBlockMachine mbm) {
|
||||
mbm.addRecipe(recipe, result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -80,8 +80,7 @@ public abstract class SubCommand {
|
||||
*
|
||||
* @return A possibly localized description of this {@link SubCommand}
|
||||
*/
|
||||
@Nonnull
|
||||
public String getDescription(@Nonnull CommandSender sender) {
|
||||
public @Nonnull String getDescription(@Nonnull CommandSender sender) {
|
||||
if (sender instanceof Player player) {
|
||||
return Slimefun.getLocalization().getMessage(player, getDescription());
|
||||
} else {
|
||||
|
@ -103,10 +103,10 @@ public class EnergyNet extends Network implements HologramOwner {
|
||||
consumers.put(l, component);
|
||||
break;
|
||||
case GENERATOR:
|
||||
if (component instanceof EnergyNetProvider energyNetProvider) {
|
||||
generators.put(l, energyNetProvider);
|
||||
} else if (component instanceof SlimefunItem slimefunItem) {
|
||||
slimefunItem.warn("This Item is marked as a GENERATOR but does not implement the interface EnergyNetProvider!");
|
||||
if (component instanceof EnergyNetProvider provider) {
|
||||
generators.put(l, provider);
|
||||
} else if (component instanceof SlimefunItem item) {
|
||||
item.warn("This Item is marked as a GENERATOR but does not implement the interface EnergyNetProvider!");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@ -272,8 +272,8 @@ public class EnergyNet extends Network implements HologramOwner {
|
||||
private static EnergyNetComponent getComponent(@Nonnull Location l) {
|
||||
SlimefunItem item = BlockStorage.check(l);
|
||||
|
||||
if (item instanceof EnergyNetComponent energyNetComponent) {
|
||||
return energyNetComponent;
|
||||
if (item instanceof EnergyNetComponent component) {
|
||||
return component;
|
||||
}
|
||||
|
||||
return null;
|
||||
|
@ -86,8 +86,8 @@ public abstract class AbstractMonsterSpawner extends SlimefunItem {
|
||||
if (meta instanceof BlockStateMeta stateMeta) {
|
||||
BlockState state = stateMeta.getBlockState();
|
||||
|
||||
if (state instanceof CreatureSpawner creatureSpawner) {
|
||||
creatureSpawner.setSpawnedType(type);
|
||||
if (state instanceof CreatureSpawner spawner) {
|
||||
spawner.setSpawnedType(type);
|
||||
}
|
||||
|
||||
stateMeta.setBlockState(state);
|
||||
|
@ -67,8 +67,8 @@ public class EnhancedCraftingTable extends AbstractCraftingTable {
|
||||
if (outputInv != null) {
|
||||
SlimefunItem sfItem = SlimefunItem.getByItem(output);
|
||||
|
||||
if (sfItem instanceof SlimefunBackpack slimefunBackpack) {
|
||||
upgradeBackpack(p, inv, slimefunBackpack, output);
|
||||
if (sfItem instanceof SlimefunBackpack backpack) {
|
||||
upgradeBackpack(p, inv, backpack, output);
|
||||
}
|
||||
|
||||
for (int j = 0; j < 9; j++) {
|
||||
|
@ -75,8 +75,8 @@ public class MagicWorkbench extends AbstractCraftingTable {
|
||||
if (outputInv != null) {
|
||||
SlimefunItem sfItem = SlimefunItem.getByItem(output);
|
||||
|
||||
if (sfItem instanceof SlimefunBackpack slimefunBackpack) {
|
||||
upgradeBackpack(p, inv, slimefunBackpack, output);
|
||||
if (sfItem instanceof SlimefunBackpack backpack) {
|
||||
upgradeBackpack(p, inv, backpack, output);
|
||||
}
|
||||
|
||||
for (int j = 0; j < 9; j++) {
|
||||
|
@ -64,7 +64,7 @@ public class TeleporterListener implements Listener {
|
||||
// Pressure plate was an elevator
|
||||
ElevatorPlate elevator = SlimefunItems.ELEVATOR_PLATE.getItem(ElevatorPlate.class);
|
||||
elevator.openInterface(p, b);
|
||||
} else if (item instanceof AbstractTeleporterPlate abstractTeleporterPlate && abstractTeleporterPlate.hasAccess(p, b)) {
|
||||
} else if (item instanceof AbstractTeleporterPlate teleporterPlate && teleporterPlate.hasAccess(p, b)) {
|
||||
// Pressure plate was a teleporter
|
||||
SlimefunItem teleporter = BlockStorage.check(b.getRelative(BlockFace.DOWN));
|
||||
|
||||
|
@ -132,8 +132,8 @@ public final class ItemStackWrapper extends ItemStack {
|
||||
public static @Nonnull ItemStackWrapper wrap(@Nonnull ItemStack itemStack) {
|
||||
Validate.notNull(itemStack, "The ItemStack cannot be null!");
|
||||
|
||||
if (itemStack instanceof ItemStackWrapper itemStackWrapper) {
|
||||
return itemStackWrapper;
|
||||
if (itemStack instanceof ItemStackWrapper wrapper) {
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
return new ItemStackWrapper(itemStack);
|
||||
|
@ -106,7 +106,7 @@ public class TagParser implements Keyed {
|
||||
JsonArray values = child.getAsJsonArray();
|
||||
|
||||
for (JsonElement element : values) {
|
||||
if (element instanceof JsonPrimitive jsonPrimitive && jsonPrimitive.isString()) {
|
||||
if (element instanceof JsonPrimitive primitive && primitive.isString()) {
|
||||
// Strings will be parsed directly
|
||||
parsePrimitiveValue(element.getAsString(), materials, tags, true);
|
||||
} else if (element instanceof JsonObject) {
|
||||
|
Loading…
Reference in New Issue
Block a user