Skip to content

Commit deb9419

Browse files
extclpextclp
committed
cleanup
1 parent 4224910 commit deb9419

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+272
-432
lines changed

‎src/main/java/carpet/api/settings/SettingsManager.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public class SettingsManager {
7878
private MinecraftServer server;
7979
private final List<RuleObserver> observers = new ArrayList<>();
8080
private static final List<RuleObserver> staticObservers = new ArrayList<>();
81-
static record ConfigReadResult(Map<String, String> ruleMap, boolean locked) {}
81+
record ConfigReadResult(Map<String, String> ruleMap, boolean locked) {}
8282

8383
/**
8484
* <p>Defines a class that can be notified about a {@link CarpetRule} changing.</p>
@@ -88,7 +88,7 @@ static record ConfigReadResult(Map<String, String> ruleMap, boolean locked) {}
8888
* @see SettingsManager#registerGlobalRuleObserver(RuleObserver)
8989
*/
9090
@FunctionalInterface
91-
public static interface RuleObserver {
91+
public interface RuleObserver {
9292
/**
9393
* <p>Notifies this {@link RuleObserver} about the change of a {@link CarpetRule}.</p>
9494
*
@@ -362,7 +362,7 @@ private void disableBooleanCommands()
362362
if (rule.suggestions().contains("false"))
363363
rule.set(server.createCommandSourceStack(), "false");
364364
else
365-
CarpetSettings.LOG.warn("Couldn't disable command rule "+ rule.name() + ": it doesn't suggest false as a valid option");
365+
CarpetSettings.LOG.warn("Couldn't disable command rule {}: it doesn't suggest false as a valid option", rule.name());
366366
} catch (InvalidRuleValueException e) {
367367
throw new IllegalStateException(e); // contract of CarpetRule.suggestions()
368368
}
@@ -569,7 +569,7 @@ static CompletableFuture<Suggestions> suggestMatchingContains(Stream<String> str
569569
String query = suggestionsBuilder.getRemaining().toLowerCase(Locale.ROOT);
570570
stream.forEach((listItem) -> {
571571
// Regex camelCase Search
572-
var words = Arrays.stream(listItem.split("(?<!^)(?=[A-Z])")).map(s -> s.toLowerCase(Locale.ROOT)).collect(Collectors.toList());
572+
var words = Arrays.stream(listItem.split("(?<!^)(?=[A-Z])")).map(s -> s.toLowerCase(Locale.ROOT)).toList();
573573
var prefixes = new ArrayList<String>(words.size());
574574
for (int i = 0; i < words.size(); i++)
575575
prefixes.add(String.join("", words.subList(i, words.size())));
@@ -658,8 +658,8 @@ private int displayRuleMenu(CommandSourceStack source, CarpetRule<?> rule) //TOD
658658
tags.add(Messenger.c("c ["+ translated +"]", "^g "+ String.format(tr(TranslationKeys.LIST_ALL_CATEGORY), translated),"!/"+identifier+" list "+t));
659659
tags.add(Messenger.c("w , "));
660660
}
661-
tags.remove(tags.size() - 1);
662-
Messenger.m(source, tags.toArray(new Object[0]));
661+
tags.removeLast();
662+
Messenger.m(source, tags.toArray());
663663

664664
Messenger.m(source, "w "+ tr(TranslationKeys.CURRENT_VALUE)+": ", String.format("%s %s (%s value)", RuleHelper.getBooleanValue(rule) ? "lb" : "nb", RuleHelper.toRuleString(rule.value()), RuleHelper.isInDefaultValue(rule) ? "default" : "modified"));
665665
List<Component> options = new ArrayList<>();
@@ -669,9 +669,9 @@ private int displayRuleMenu(CommandSourceStack source, CarpetRule<?> rule) //TOD
669669
options.add(makeSetRuleButton(rule, o, false));
670670
options.add(Messenger.c("w "));
671671
}
672-
options.remove(options.size()-1);
672+
options.removeLast();
673673
options.add(Messenger.c("y ]"));
674-
Messenger.m(source, options.toArray(new Object[0]));
674+
Messenger.m(source, options.toArray());
675675

676676
return 1;
677677
}
@@ -736,8 +736,8 @@ private Component displayInteractiveSetting(CarpetRule<?> rule)
736736
args.add(makeSetRuleButton(rule, RuleHelper.toRuleString(rule.value()), true));
737737
args.add("w ");
738738
}
739-
args.remove(args.size()-1);
740-
return Messenger.c(args.toArray(new Object[0]));
739+
args.removeLast();
740+
return Messenger.c(args.toArray());
741741
}
742742

743743
private Component makeSetRuleButton(CarpetRule<?> rule, String option, boolean brackets)
@@ -780,8 +780,8 @@ private int listAllSettings(CommandSourceStack source)
780780
tags.add("!/"+identifier+" list " + t);
781781
tags.add("w ");
782782
}
783-
tags.remove(tags.size() - 1);
784-
Messenger.m(source, tags.toArray(new Object[0]));
783+
tags.removeLast();
784+
Messenger.m(source, tags.toArray());
785785

786786
return count;
787787
}

‎src/main/java/carpet/commands/InfoCommand.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,14 @@ public static void printBlock(List<Component> messages, CommandSourceStack sourc
4949
if (grep != null)
5050
{
5151
Pattern p = Pattern.compile(grep);
52-
Messenger.m(source, messages.get(0));
53-
for (int i = 1; i<messages.size(); i++)
54-
{
55-
Component line = messages.get(i);
52+
Messenger.m(source, messages.getFirst());
53+
messages.forEach(line -> {
5654
Matcher m = p.matcher(line.getString());
5755
if (m.find())
5856
{
5957
Messenger.m(source, line);
6058
}
61-
}
59+
});
6260
}
6361
else
6462
{

‎src/main/java/carpet/commands/LogCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private static int listLogs(CommandSourceStack source)
129129
comp.add("^w Click to unsubscribe");
130130
comp.add("!/log "+lname);
131131
}
132-
Messenger.m(player,comp.toArray(new Object[0]));
132+
Messenger.m(player,comp.toArray());
133133
}
134134
return 1;
135135
}

‎src/main/java/carpet/commands/SpawnCommand.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package carpet.commands;
22

33
import carpet.CarpetSettings;
4-
import carpet.fakes.SpawnGroupInterface;
54
import carpet.helpers.HopperCounter;
65
import carpet.utils.CommandHelper;
76
import carpet.utils.Messenger;
@@ -210,10 +209,7 @@ private static int generalMobcaps(CommandSourceStack source)
210209

211210
private static int resetSpawnRates(CommandSourceStack source)
212211
{
213-
for (MobCategory s: SpawnReporter.spawn_tries.keySet())
214-
{
215-
SpawnReporter.spawn_tries.put(s,1);
216-
}
212+
SpawnReporter.spawn_tries.replaceAll((s, v) -> 1);
217213
Messenger.m(source, "gi Spawn rates brought to 1 round per tick for all groups.");
218214

219215
return 1;
@@ -229,7 +225,7 @@ private static int setSpawnRates(CommandSourceStack source, String mobtype, int
229225

230226
private static int setMobcaps(CommandSourceStack source, int hostile_cap)
231227
{
232-
double desired_ratio = (double)hostile_cap/ ((SpawnGroupInterface)(Object)MobCategory.MONSTER).getInitialSpawnCap();
228+
double desired_ratio = (double)hostile_cap/ MobCategory.MONSTER.getMaxInstancesPerChunk();
233229
SpawnReporter.mobcap_exponent = 4.0*Math.log(desired_ratio)/Math.log(2.0);
234230
Messenger.m(source, String.format("gi Mobcaps for hostile mobs changed to %d, other groups will follow", hostile_cap));
235231
return 1;

‎src/main/java/carpet/fakes/ChunkTicketManagerInterface.java

-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import net.minecraft.server.level.ChunkHolder;
55
import net.minecraft.server.level.Ticket;
66
import net.minecraft.util.SortedArraySet;
7-
import net.minecraft.world.level.ChunkPos;
87

98
public interface ChunkTicketManagerInterface
109
{
11-
void changeSpawnChunks(ChunkPos pos, int distance);
1210

1311
Long2ObjectOpenHashMap<SortedArraySet<Ticket<?>>> getTicketsByPosition();
1412

‎src/main/java/carpet/fakes/IngredientInterface.java

-14
This file was deleted.

‎src/main/java/carpet/fakes/RedstoneWireBlockInterface.java

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
public interface RedstoneWireBlockInterface {
88
BlockState updateLogicPublic(Level world_1, BlockPos blockPos_1, BlockState blockState_1);
99
void setWiresGivePower(boolean wiresGivePower);
10-
boolean getWiresGivePower();
1110
}

‎src/main/java/carpet/fakes/SpawnGroupInterface.java

-6
This file was deleted.

‎src/main/java/carpet/fakes/ThreadedAnvilChunkStorageInterface.java

-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.List;
44
import java.util.Map;
5-
import net.minecraft.server.level.ChunkHolder;
65
import net.minecraft.world.level.ChunkPos;
76

87
public interface ThreadedAnvilChunkStorageInterface
@@ -12,6 +11,4 @@ public interface ThreadedAnvilChunkStorageInterface
1211
void relightChunk(ChunkPos pos);
1312

1413
void releaseRelightTicket(ChunkPos pos);
15-
16-
Iterable<ChunkHolder> getChunksCM();
1714
}

‎src/main/java/carpet/helpers/EntityPlayerActionPack.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public EntityPlayerActionPack mount(boolean onlyRideables)
181181
{
182182
entities = player.level().getEntities(player, player.getBoundingBox().inflate(3.0D, 1.0D, 3.0D));
183183
}
184-
if (entities.size()==0)
184+
if (entities.isEmpty())
185185
return this;
186186
Entity closest = null;
187187
double distance = Double.POSITIVE_INFINITY;

‎src/main/java/carpet/helpers/HopperCounter.java

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package carpet.helpers;
22

33
import carpet.CarpetServer;
4-
import carpet.fakes.IngredientInterface;
54
import carpet.fakes.RecipeManagerInterface;
65
import carpet.utils.Messenger;
76
import it.unimi.dsi.fastutil.objects.Object2LongLinkedOpenHashMap;
@@ -32,13 +31,11 @@
3231
import net.minecraft.world.level.material.MapColor;
3332

3433
import java.util.ArrayList;
35-
import java.util.Collection;
3634
import java.util.Collections;
3735
import java.util.EnumMap;
3836
import java.util.List;
3937
import java.util.Locale;
4038
import java.util.Map;
41-
import java.util.stream.Collectors;
4239

4340
import static java.util.Map.entry;
4441

@@ -177,7 +174,7 @@ public static List<Component> formatAll(MinecraftServer server, boolean realtime
177174
public List<Component> format(MinecraftServer server, boolean realTime, boolean brief)
178175
{
179176
long ticks = Math.max(realTime ? (System.currentTimeMillis() - startMillis) / 50 : server.overworld().getGameTime() - startTick, 1);
180-
if (startTick < 0 || ticks == 0)
177+
if (startTick < 0)
181178
{
182179
if (brief)
183180
{
@@ -222,7 +219,7 @@ public List<Component> format(MinecraftServer server, boolean realTime, boolean
222219
"g : ","wb "+count,"g , ",
223220
String.format("wb %.1f", count * (20.0 * 60.0 * 60.0) / ticks), "w /h"
224221
);
225-
}).collect(Collectors.toList()));
222+
}).toList());
226223
return items;
227224
}
228225

@@ -378,14 +375,11 @@ public static TextColor guessColor(Item item, RegistryAccess registryAccess)
378375
{
379376
for (Ingredient ingredient: r.getIngredients())
380377
{
381-
for (Collection<ItemStack> stacks : ((IngredientInterface) (Object) ingredient).getRecipeStacks())
378+
for (ItemStack iStak : ingredient.getItems())
382379
{
383-
for (ItemStack iStak : stacks)
384-
{
385-
TextColor cand = fromItem(iStak.getItem(), registryAccess);
386-
if (cand != null)
387-
return cand;
388-
}
380+
TextColor cand = fromItem(iStak.getItem(), registryAccess);
381+
if (cand != null)
382+
return cand;
389383
}
390384
}
391385
}

‎src/main/java/carpet/helpers/RedstoneWireTurbo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,6 @@ public void updateNeighborShapes(Level level, BlockPos pos, BlockState state) {
963963
private static int getMaxCurrentStrength(final UpdateNode upd, final int strength) {
964964
if (upd.type != UpdateNode.Type.REDSTONE) return strength;
965965
final int i = upd.currentState.getValue(RedStoneWireBlock.POWER);
966-
return i > strength ? i : strength;
966+
return Math.max(i, strength);
967967
}
968968
}

‎src/main/java/carpet/logging/HUDController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static void update_hud(MinecraftServer server, List<ServerPlayer> force)
9090
case "end" -> Level.END;
9191
default -> player.level().dimension();
9292
};
93-
return new Component[]{SpawnReporter.printMobcapsForDimension(server.getLevel(dim), false).get(0)};
93+
return new Component[]{SpawnReporter.printMobcapsForDimension(server.getLevel(dim), false).getFirst()};
9494
});
9595

9696
if(LoggerRegistry.__counter)
@@ -108,7 +108,7 @@ public static void update_hud(MinecraftServer server, List<ServerPlayer> force)
108108
{
109109
ClientboundTabListPacket packet = new ClientboundTabListPacket(
110110
scarpet_headers.getOrDefault(player.getScoreboardName(), Component.literal("")),
111-
Messenger.c(player_huds.getOrDefault(player, List.of()).toArray(new Object[0]))
111+
Messenger.c(player_huds.getOrDefault(player, List.of()).toArray())
112112
);
113113
player.connection.send(packet);
114114
}

‎src/main/java/carpet/logging/logHelpers/ExplosionLogHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void onEntityImpacted(Entity entity, Vec3 accel)
9696
}
9797

9898

99-
public static record EntityChangedStatusWithCount(Vec3 pos, EntityType<?> type, Vec3 accel)
99+
public record EntityChangedStatusWithCount(Vec3 pos, EntityType<?> type, Vec3 accel)
100100
{
101101
public EntityChangedStatusWithCount(Entity e, Vec3 accel)
102102
{

‎src/main/java/carpet/logging/logHelpers/TrajectoryLogHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void onFinish()
5151
line.add(String.format("^w Tick: %d\nx: %f\ny: %f\nz: %f\n------------\nmx: %f\nmy: %f\nmz: %f",
5252
i, pos.x, pos.y, pos.z, mot.x, mot.y, mot.z));
5353
if ((((i + 1) % MAX_TICKS_PER_LINE) == 0) || i == positions.size() - 1) {
54-
comp.add(Messenger.c(line.toArray(new Object[0])));
54+
comp.add(Messenger.c(line.toArray()));
5555
line.clear();
5656
}
5757
}

‎src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java

-6
Original file line numberDiff line numberDiff line change
@@ -547,10 +547,4 @@ public Map<String, Integer> regenerateChunkRegion(List<ChunkPos> requestedChunks
547547

548548
return report;
549549
}
550-
551-
@Override
552-
public Iterable<ChunkHolder> getChunksCM()
553-
{
554-
return getChunks();
555-
}
556550
}

‎src/main/java/carpet/mixins/DistanceManager_spawnChunksMixin.java

-55
This file was deleted.

‎src/main/java/carpet/mixins/Ingredient_scarpetMixin.java

-24
This file was deleted.

0 commit comments

Comments
 (0)