Skip to content

Commit 7098ded

Browse files
shartteshartte
committed
Renames
1 parent 4bf5eef commit 7098ded

37 files changed

+243
-404
lines changed

‎src/main/java/dev/technici4n/moderndynamics/MdBlockEntity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public MdBlockEntity(BlockEntityType<?> bet, BlockPos pos, BlockState state) {
4646
// Thank you Fabric API
4747
public void sync(boolean shouldRemesh) {
4848
Preconditions.checkNotNull(level); // Maintain distinct failure case from below
49-
if (!(level instanceof ServerLevel serverWorld))
50-
throw new IllegalStateException("Cannot call sync() on the logical client! Did you check world.isClient first?");
49+
if (!(level instanceof ServerLevel serverLevel))
50+
throw new IllegalStateException("Cannot call sync() on the logical client! Did you check level.isClient first?");
5151

5252
shouldClientRemesh = shouldRemesh | shouldClientRemesh;
53-
serverWorld.getChunkSource().blockChanged(getBlockPos());
53+
serverLevel.getChunkSource().blockChanged(getBlockPos());
5454
}
5555

5656
public void sync() {
@@ -109,7 +109,7 @@ public final void remesh() {
109109
if (!level.isClientSide())
110110
throw new IllegalStateException("Cannot call remesh() on the server!");
111111

112-
level.sendBlockUpdated(worldPosition, null, null, 0);
112+
level.sendBlockUpdated(getBlockPos(), null, null, 0);
113113
}
114114

115115
protected final boolean isClientSide() {

‎src/main/java/dev/technici4n/moderndynamics/attachment/attached/AttachedIo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public AttachedIo(AttachmentItem item, ValueInput configData, Runnable setChange
5252
this.setChangedCallback = setChangedCallback;
5353
this.filterInversion = readEnum(FilterInversionMode.values(), configData, "filterInversion", FilterInversionMode.BLACKLIST);
5454
this.redstoneMode = readEnum(RedstoneMode.values(), configData, "redstoneMode", RedstoneMode.IGNORED);
55-
this.upgradeContainer.readNbt(configData);
55+
this.upgradeContainer.read(configData);
5656
}
5757

5858
@Override
@@ -61,7 +61,7 @@ public void writeConfigTag(ValueOutput output) {
6161

6262
writeEnum(this.filterInversion, output, "filterInversion");
6363
writeEnum(this.redstoneMode, output, "redstoneMode");
64-
this.upgradeContainer.writeNbt(output);
64+
this.upgradeContainer.write(output);
6565
}
6666

6767
public FilterInversionMode getFilterInversion() {

‎src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidAttachedIo.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ public FluidResource getFilter(int idx) {
6969
return filters.get(idx);
7070
}
7171

72-
public void setFilter(int idx, FluidResource variant) {
73-
if (!variant.equals(this.filters.get(idx))) {
74-
this.filters.set(idx, variant);
72+
public void setFilter(int idx, FluidResource resource) {
73+
if (!resource.equals(this.filters.get(idx))) {
74+
this.filters.set(idx, resource);
7575
setChangedCallback.run();
7676
resetCachedFilter();
7777
}
7878
}
7979

80-
public boolean matchesFilter(FluidResource variant) {
80+
public boolean matchesFilter(FluidResource resource) {
8181
if (cachedFilter == null) {
8282
cachedFilter = new FluidCachedFilter(filters.subList(0, getFilterSize()), getFilterInversion());
8383
}
84-
return cachedFilter.matches(variant);
84+
return cachedFilter.matches(resource);
8585
}
8686

8787
public int getFluidMaxIo() {

‎src/main/java/dev/technici4n/moderndynamics/attachment/attached/FluidCachedFilter.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@
2525
import net.neoforged.neoforge.transfer.fluid.FluidResource;
2626

2727
public class FluidCachedFilter {
28-
private final Set<FluidResource> listedVariants;
28+
private final Set<FluidResource> listedResources;
2929
private final FilterInversionMode filterInversion;
3030

31-
public FluidCachedFilter(List<FluidResource> variants,
31+
public FluidCachedFilter(List<FluidResource> resources,
3232
FilterInversionMode filterInversion) {
33-
this.listedVariants = new HashSet<>();
33+
this.listedResources = new HashSet<>();
3434
this.filterInversion = filterInversion;
3535

36-
for (var variant : variants) {
37-
if (!variant.isEmpty()) {
38-
listedVariants.add(variant);
36+
for (var resource : resources) {
37+
if (!resource.isEmpty()) {
38+
listedResources.add(resource);
3939
}
4040
}
4141
}
4242

43-
public boolean matches(FluidResource variant) {
44-
return (filterInversion == FilterInversionMode.WHITELIST) == listedVariants.contains(variant);
43+
public boolean matches(FluidResource resource) {
44+
return (filterInversion == FilterInversionMode.WHITELIST) == listedResources.contains(resource);
4545
}
4646
}

‎src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemAttachedIo.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,17 +163,17 @@ public void onUpgradesChanged() {
163163
setMaxItemsExtracted(getMaxItemsExtracted());
164164
}
165165

166-
public boolean matchesItemFilter(ItemResource variant) {
167-
return getCachedFilter().matchesItem(variant);
166+
public boolean matchesItemFilter(ItemResource resource) {
167+
return getCachedFilter().matchesItem(resource);
168168
}
169169

170170
public ItemResource getFilter(int idx) {
171171
return filters.get(idx);
172172
}
173173

174-
public void setFilter(int idx, ItemResource variant) {
175-
if (!variant.equals(this.filters.get(idx))) {
176-
this.filters.set(idx, variant);
174+
public void setFilter(int idx, ItemResource resource) {
175+
if (!resource.equals(this.filters.get(idx))) {
176+
this.filters.set(idx, resource);
177177
setChangedCallback.run();
178178
resetCachedFilter();
179179
}

‎src/main/java/dev/technici4n/moderndynamics/attachment/attached/ItemCachedFilter.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.jetbrains.annotations.Nullable;
3636

3737
public final class ItemCachedFilter {
38-
private final Set<ItemResource> listedVariants;
38+
private final Set<ItemResource> listedResources;
3939
private final Set<Item> listedItems;
4040
private final FilterInversionMode filterInversion;
4141
private final FilterDamageMode filterDamage;
@@ -61,30 +61,30 @@ public ItemCachedFilter(List<ItemResource> filterConfig,
6161
this.filterMod = filterMod;
6262

6363
// Dedupe and drop blanks
64-
this.listedVariants = new HashSet<>(filterConfig.size());
64+
this.listedResources = new HashSet<>(filterConfig.size());
6565
this.listedItems = Collections.newSetFromMap(new IdentityHashMap<>());
66-
for (var variant : filterConfig) {
67-
if (!variant.isEmpty()) {
68-
this.listedVariants.add(variant);
69-
this.listedItems.add(variant.getItem());
66+
for (var resource : filterConfig) {
67+
if (!resource.isEmpty()) {
68+
this.listedResources.add(resource);
69+
this.listedItems.add(resource.getItem());
7070
}
7171
}
7272
}
7373

74-
private boolean isItemListed(ItemResource variant) {
75-
// Return value if the variant is included
74+
private boolean isItemListed(ItemResource resource) {
75+
// Return value if the resource is included
7676
boolean itemIsListed = false;
7777

7878
// When inclusion of all listed mods is enabled, matching by individual item/NBT/damage is pointless
7979
if (filterMod == FilterModMode.INCLUDE_ALL_OF_MOD) {
80-
if (getListedMods().contains(getModId(variant))) {
80+
if (getListedMods().contains(getModId(resource))) {
8181
itemIsListed = true;
8282
}
8383
} else {
8484
if (filterNbt == FilterNbtMode.RESPECT_NBT) {
85-
itemIsListed = listedVariants.contains(variant);
85+
itemIsListed = listedResources.contains(resource);
8686
} else {
87-
itemIsListed = listedItems.contains(variant.getItem());
87+
itemIsListed = listedItems.contains(resource.getItem());
8888
}
8989

9090
// Possibly handle matching damage too
@@ -98,33 +98,33 @@ private boolean isItemListed(ItemResource variant) {
9898
return itemIsListed;
9999
}
100100

101-
public boolean matchesItem(ItemResource variant) {
102-
return isItemListed(variant) == (filterInversion == FilterInversionMode.WHITELIST);
101+
public boolean matchesItem(ItemResource resource) {
102+
return isItemListed(resource) == (filterInversion == FilterInversionMode.WHITELIST);
103103
}
104104

105105
private Set<String> getListedMods() {
106106
if (listedMods == null) {
107107
listedMods = new HashSet<>();
108-
for (var variant : listedVariants) {
109-
listedMods.add(getModId(variant));
108+
for (var resource : listedResources) {
109+
listedMods.add(getModId(resource));
110110
}
111111
}
112112

113113
return listedMods;
114114
}
115115

116-
public boolean matchesFluid(FluidResource variant) {
116+
public boolean matchesFluid(FluidResource resource) {
117117
return false;
118118
}
119119

120-
private static String getModId(ItemResource variant) {
120+
private static String getModId(ItemResource resource) {
121121
// This returns "minecraft" if the item is unregistered
122-
return BuiltInRegistries.ITEM.getKey(variant.getItem()).getNamespace();
122+
return BuiltInRegistries.ITEM.getKey(resource.getItem()).getNamespace();
123123
}
124124

125-
private static String getModId(FluidResource variant) {
125+
private static String getModId(FluidResource resource) {
126126
// This returns "minecraft" if the item is unregistered
127-
return BuiltInRegistries.FLUID.getKey(variant.getFluid()).getNamespace();
127+
return BuiltInRegistries.FLUID.getKey(resource.getFluid()).getNamespace();
128128
}
129129

130130
@FunctionalInterface

‎src/main/java/dev/technici4n/moderndynamics/attachment/attached/UpgradeContainer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
class UpgradeContainer {
3434
final NonNullList<ItemStack> upgrades = NonNullList.withSize(AttachedIo.UPGRADE_SLOTS, ItemStack.EMPTY);
3535

36-
public void readNbt(ValueInput input) {
36+
public void read(ValueInput input) {
3737
ContainerHelper.loadAllItems(input, upgrades);
3838
}
3939

40-
public void writeNbt(ValueOutput output) {
40+
public void write(ValueOutput output) {
4141
ContainerHelper.saveAllItems(output, upgrades);
4242
}
4343

‎src/main/java/dev/technici4n/moderndynamics/client/ModernDynamicsClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import dev.technici4n.moderndynamics.network.item.sync.ClientTravelingItemSmoothing;
3131
import dev.technici4n.moderndynamics.packets.MdPackets;
3232
import dev.technici4n.moderndynamics.packets.SetAttachmentUpgrades;
33-
import dev.technici4n.moderndynamics.packets.SetFluidVariant;
34-
import dev.technici4n.moderndynamics.packets.SetItemVariant;
33+
import dev.technici4n.moderndynamics.packets.SetFluidResource;
34+
import dev.technici4n.moderndynamics.packets.SetItemResource;
3535
import dev.technici4n.moderndynamics.pipe.PipeBlock;
3636
import dev.technici4n.moderndynamics.pipe.PipeBlockEntity;
3737
import dev.technici4n.moderndynamics.pipe.PipeBoundingBoxes;
@@ -86,8 +86,8 @@ public ModernDynamicsClient(IEventBus modEvents) {
8686

8787
modEvents.addListener(RegisterClientPayloadHandlersEvent.class, e -> {
8888
e.register(SetAttachmentUpgrades.TYPE, SetAttachmentUpgrades.HANDLER);
89-
e.register(SetItemVariant.TYPE, MdPackets.SET_ITEM_VARIANT_HANDLER);
90-
e.register(SetFluidVariant.TYPE, MdPackets.SET_FLUID_VARIANT_HANDLER);
89+
e.register(SetItemResource.TYPE, MdPackets.SET_ITEM_RESOURCE_HANDLER);
90+
e.register(SetFluidResource.TYPE, MdPackets.SET_FLUID_RESOURCE_HANDLER);
9191
e.register(MdPackets.SET_FILTER_MODE, MdPackets.SET_FILTER_MODE_HANDLER);
9292
e.register(MdPackets.SET_FILTER_DAMAGE, MdPackets.SET_FILTER_DAMAGE_HANDLER);
9393
e.register(MdPackets.SET_FILTER_NBT, MdPackets.SET_FILTER_NBT_HANDLER);

‎src/main/java/dev/technici4n/moderndynamics/client/ber/PipeBlockEntityRenderer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void extractRenderState(PipeBlockEntity blockEntity,
104104
itemState.ty = (float) (to.y() * ratio + from.y() * (1 - ratio));
105105
itemState.tz = (float) (to.z() * ratio + from.z() * (1 - ratio));
106106

107-
itemState.randomSeed = item.variant().hashCode() + item.id;
107+
itemState.randomSeed = item.resource().hashCode() + item.id;
108108
random.setSeed(itemState.randomSeed);
109109

110110
// Cool rotation
@@ -114,10 +114,10 @@ public void extractRenderState(PipeBlockEntity blockEntity,
114114
// Render multiple items depending on stack size
115115
itemState.renderCount = getRenderAmount(item.amount());
116116

117-
itemModelResolver.updateForTopItem(itemState.itemStack, item.variant().toStack(), ItemDisplayContext.GROUND, level, null, 0);
117+
itemModelResolver.updateForTopItem(itemState.itemStack, item.resource().toStack(), ItemDisplayContext.GROUND, level, null, 0);
118118
}
119119
} else if (host instanceof FluidHost fluidHost) {
120-
var fluid = fluidHost.getVariant();
120+
var fluid = fluidHost.getResource();
121121
var fill = (float) fluidHost.getAmount() / Constants.Fluids.CAPACITY;
122122

123123
var renderProps = IClientFluidTypeExtensions.of(fluid.getFluid());

‎src/main/java/dev/technici4n/moderndynamics/client/compat/jei/MdJeiPlugin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ public List<Rect2i> getGuiExtraAreas(AttachedIoScreen<?> screen) {
9292
public Optional<IClickableIngredient<?>> getClickableIngredientUnderMouse(AttachedIoScreen<?> screen, double mouseX, double mouseY) {
9393
// Ensures that users can press R, U, etc... on fluid config slots.
9494
if (screen.getHoveredSlot() instanceof FluidConfigSlot fluidConfig) {
95-
var variant = fluidConfig.getFilter();
96-
if (!variant.isEmpty()) {
95+
var resource = fluidConfig.getFilter();
96+
if (!resource.isEmpty()) {
9797
var ing = registration.getJeiHelpers().getIngredientManager();
98-
return ing.createTypedIngredient(variant.toStack(1))
98+
return ing.createTypedIngredient(resource.toStack(1))
9999
.map(slotArea(screen, fluidConfig));
100100
}
101101
}

0 commit comments

Comments
 (0)