Skip to content

Commit 7199e81

Browse files
committed
Fix a few issues and typos in some of the tag translations
1 parent 098ce1f commit 7199e81

File tree

13 files changed

+85
-106
lines changed

13 files changed

+85
-106
lines changed

src/api/java/mekanism/api/SerializerHelper.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ private SerializerHelper() {
5252
* @return a RecordCodecBuilder which contains the resulting logic - use in side a `group()`
5353
*/
5454
@NotNull
55-
public static <SOURCE, THIS_TYPE> RecordCodecBuilder<SOURCE, Optional<THIS_TYPE>> dependentOptionality(RecordCodecBuilder<SOURCE, ? extends Optional<?>> primaryField, MapCodec<Optional<THIS_TYPE>> dependentCodec, Function<SOURCE, Optional<THIS_TYPE>> dependentGetter) {
55+
public static <SOURCE, THIS_TYPE> RecordCodecBuilder<SOURCE, Optional<THIS_TYPE>> dependentOptionality(RecordCodecBuilder<SOURCE, ? extends Optional<?>> primaryField,
56+
MapCodec<Optional<THIS_TYPE>> dependentCodec, Function<SOURCE, Optional<THIS_TYPE>> dependentGetter) {
5657
Implementation<Optional<THIS_TYPE>> dependentRequired = new Implementation<>() {
5758
@Override
5859
public <T> DataResult<Optional<THIS_TYPE>> decode(DynamicOps<T> ops, MapLike<T> input) {
@@ -88,7 +89,8 @@ public <T> Stream<T> keys(DynamicOps<T> ops) {
8889
* @return a RecordCodecBuilder which contains the resulting logic - use in side a `group()`
8990
*/
9091
@NotNull
91-
public static <SOURCE, THIS_TYPE> RecordCodecBuilder<SOURCE, Optional<THIS_TYPE>> oneRequired(RecordCodecBuilder<SOURCE, ? extends Optional<?>> otherField, MapCodec<Optional<THIS_TYPE>> dependentCodec, Function<SOURCE, Optional<THIS_TYPE>> dependentGetter) {
92+
public static <SOURCE, THIS_TYPE> RecordCodecBuilder<SOURCE, Optional<THIS_TYPE>> oneRequired(RecordCodecBuilder<SOURCE, ? extends Optional<?>> otherField,
93+
MapCodec<Optional<THIS_TYPE>> dependentCodec, Function<SOURCE, Optional<THIS_TYPE>> dependentGetter) {
9294
Implementation<Optional<THIS_TYPE>> dependentRequired = new Implementation<>() {
9395
@Override
9496
public <T> DataResult<Optional<THIS_TYPE>> decode(DynamicOps<T> ops, MapLike<T> input) {

src/api/java/mekanism/api/inventory/IHashedItem.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package mekanism.api.inventory;
22

33
import net.minecraft.MethodsReturnNonnullByDefault;
4-
import net.minecraft.core.component.DataComponentMap;
54
import net.minecraft.world.item.Item;
65
import net.minecraft.world.item.ItemStack;
76

@@ -48,24 +47,4 @@ default Item getItem() {
4847
default int getMaxStackSize() {
4948
return getInternalStack().getMaxStackSize();
5049
}
51-
52-
/**
53-
* Helper to get the tag of the internal {@link ItemStack} that backs this item type. It is <strong>IMPORTANT</strong> to not modify the returned tag.
54-
*
55-
* @return Tag of the internal {@link ItemStack} that backs this item type.
56-
*
57-
* @apiNote Do not modify the returned tag.
58-
*/
59-
60-
/**
61-
* Helper to serialize the attachments of the internal {@link ItemStack} that backs this item type.
62-
*
63-
* @return New serialization of the internal {@link ItemStack} that backs this item type.
64-
*
65-
* @since 10.5.0
66-
*/
67-
//TODO - 1.20.5: Docs and re-evaluate this. Do we want to be working on the components, or the component patch?
68-
default DataComponentMap getInternalComponents() {
69-
return getInternalStack().getComponents();
70-
}
7150
}

src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/main/java/mekanism/client/lang/BaseLanguageProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected void add(IModuleDataProvider<?> moduleDataProvider, String name, Strin
104104
protected void addFluid(FluidRegistryObject<?, ?, ?, ?, ?> fluidRO, String name) {
105105
add(fluidRO.getBlock(), name);
106106
add(fluidRO.getBucket(), name + " Bucket");
107-
addTag(ItemTags.create(Tags.Items.BUCKETS.location().withSuffix("/" + fluidRO.getName())), name + "Buckets");
107+
addTag(ItemTags.create(Tags.Items.BUCKETS.location().withSuffix("/" + fluidRO.getName())), name + " Buckets");
108108
}
109109

110110
protected void add(MekanismAdvancement advancement, String title, String description) {

0 commit comments

Comments
 (0)