Skip to content

Commit 9764d8f

Browse files
AmpflowerAmpflower
committed
Update to 1.19.3
1 parent ea72b73 commit 9764d8f

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎gradle.properties‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# Project Specifics
2-
projectVersion=0.1.0
2+
projectVersion=0.2.0
33
modrinthId=jsiDlnm9
44

55
# Minecraft
6-
minecraftVersion=1.18.2
7-
minecraftRequired=1.18.2
8-
minecraftCompatible=1.18.2,1.19
9-
yarnMappings=1.18.2+build.3
10-
loaderVersion=0.14.10
11-
fabricApiVersion=0.67.0+1.18.2
6+
minecraftVersion=1.19.3
7+
minecraftRequired=1.19.3
8+
minecraftCompatible=1.19.3
9+
yarnMappings=1.19.3+build.2
10+
loaderVersion=0.14.11
11+
fabricApiVersion=0.68.1+1.19.3
1212

1313
# Plugins
14-
systemProp.loomVersion=1.0.12
15-
systemProp.spotlessVersion=6.12.0
16-
systemProp.minotaurVersion=2.4.5
17-
systemProp.quiltflowerVersion=1.7.4
14+
systemProp.loomVersion=1.+
15+
systemProp.spotlessVersion=6.+
16+
systemProp.minotaurVersion=2.+
17+
systemProp.quiltflowerVersion=1.+
1818

1919
# Gradle Extras
2020
org.gradle.jvmargs=-Xmx1G

‎src/main/java/net/kjp12/ddc/Config.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
1313
import net.fabricmc.loader.api.FabricLoader;
1414
import net.minecraft.block.ComposterBlock;
15+
import net.minecraft.registry.Registries;
1516
import net.minecraft.util.Identifier;
16-
import net.minecraft.util.registry.Registry;
1717

1818
import java.io.IOException;
1919
import java.lang.reflect.Type;
@@ -129,7 +129,7 @@ public void generateSettings() {
129129
if (generating) {
130130
compostableItems = new Object2FloatOpenHashMap<>();
131131
ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE
132-
.forEach((item, value) -> compostableItems.put(Registry.ITEM.getId(item.asItem()), value));
132+
.forEach((item, value) -> compostableItems.put(Registries.ITEM.getId(item.asItem()), value));
133133

134134
write();
135135
}

‎src/main/java/net/kjp12/ddc/LoggingObject2FloatMap.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import it.unimi.dsi.fastutil.shorts.Short2FloatFunction;
2222
import it.unimi.dsi.fastutil.shorts.Short2ObjectFunction;
2323
import net.minecraft.item.ItemConvertible;
24-
import net.minecraft.util.registry.Registry;
24+
import net.minecraft.registry.Registries;
2525
import org.jetbrains.annotations.NotNull;
2626

2727
import java.util.Map;
@@ -63,7 +63,7 @@ public double applyAsDouble(K operand) {
6363
@Override
6464
public float put(K key, float value) {
6565
if (key instanceof ItemConvertible ic) {
66-
Main.logger.info("Put detected for {}: {} -> {}", ic, Registry.ITEM.getId(ic.asItem()), value,
66+
Main.logger.info("Put detected for {}: {} -> {}", ic, Registries.ITEM.getId(ic.asItem()), value,
6767
new Throwable());
6868
} else {
6969
Main.logger.info("Put detected for {} -> {}", key, value, new Throwable());
@@ -232,7 +232,7 @@ public void replaceAll(BiFunction<? super K, ? super Float, ? extends Float> fun
232232
public Float computeIfAbsent(K key, @NotNull Function<? super K, ? extends Float> mappingFunction) {
233233
if (key instanceof ItemConvertible ic) {
234234
Main.logger.info("Potential put detected for {}: {} with given function {}", ic,
235-
Registry.ITEM.getId(ic.asItem()), mappingFunction, new Throwable());
235+
Registries.ITEM.getId(ic.asItem()), mappingFunction, new Throwable());
236236
} else {
237237
Main.logger.info("Potential put detected for {} with given function {}", key, mappingFunction,
238238
new Throwable());
@@ -245,7 +245,7 @@ public Float computeIfPresent(K key,
245245
@NotNull BiFunction<? super K, ? super Float, ? extends Float> remappingFunction) {
246246
if (key instanceof ItemConvertible ic) {
247247
Main.logger.info("Potential put detected for {}: {} with given function {}", ic,
248-
Registry.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
248+
Registries.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
249249
} else {
250250
Main.logger.info("Potential put detected for {} with given function {}", key, remappingFunction,
251251
new Throwable());
@@ -257,7 +257,7 @@ public Float computeIfPresent(K key,
257257
public Float compute(K key, @NotNull BiFunction<? super K, ? super Float, ? extends Float> remappingFunction) {
258258
if (key instanceof ItemConvertible ic) {
259259
Main.logger.info("Potential put detected for {}: {} with given function {}", ic,
260-
Registry.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
260+
Registries.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
261261
} else {
262262
Main.logger.info("Potential put detected for {} with given function {}", key, remappingFunction,
263263
new Throwable());
@@ -278,7 +278,7 @@ public float removeFloat(Object key) {
278278
@Override
279279
public float putIfAbsent(K key, float value) {
280280
if (key instanceof ItemConvertible ic) {
281-
Main.logger.info("Potential put detected for {}: {} -> {}", ic, Registry.ITEM.getId(ic.asItem()), value,
281+
Main.logger.info("Potential put detected for {}: {} -> {}", ic, Registries.ITEM.getId(ic.asItem()), value,
282282
new Throwable());
283283
} else {
284284
Main.logger.info("Potential put detected for {} -> {}", key, value, new Throwable());
@@ -305,7 +305,7 @@ public float replace(K key, float value) {
305305
public float computeIfAbsent(K key, ToDoubleFunction<? super K> mappingFunction) {
306306
if (key instanceof ItemConvertible ic) {
307307
Main.logger.info("Potential put detected for {}: {} with given function {}", ic,
308-
Registry.ITEM.getId(ic.asItem()), mappingFunction, new Throwable());
308+
Registries.ITEM.getId(ic.asItem()), mappingFunction, new Throwable());
309309
} else {
310310
Main.logger.info("Potential put detected for {} with given function {}", key, mappingFunction,
311311
new Throwable());
@@ -317,7 +317,7 @@ public float computeIfAbsent(K key, ToDoubleFunction<? super K> mappingFunction)
317317
public float computeIfAbsent(K key, Object2FloatFunction<? super K> mappingFunction) {
318318
if (key instanceof ItemConvertible ic) {
319319
Main.logger.info("Potential put detected for {}: {} with given function {}", ic,
320-
Registry.ITEM.getId(ic.asItem()), mappingFunction, new Throwable());
320+
Registries.ITEM.getId(ic.asItem()), mappingFunction, new Throwable());
321321
} else {
322322
Main.logger.info("Potential put detected for {} with given function {}", key, mappingFunction,
323323
new Throwable());
@@ -329,7 +329,7 @@ public float computeIfAbsent(K key, Object2FloatFunction<? super K> mappingFunct
329329
public float computeFloatIfPresent(K key, BiFunction<? super K, ? super Float, ? extends Float> remappingFunction) {
330330
if (key instanceof ItemConvertible ic) {
331331
Main.logger.info("Potential put detected for {}: {} with given function {}", ic,
332-
Registry.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
332+
Registries.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
333333
} else {
334334
Main.logger.info("Potential put detected for {} with given function {}", key, remappingFunction,
335335
new Throwable());
@@ -341,7 +341,7 @@ public float computeFloatIfPresent(K key, BiFunction<? super K, ? super Float, ?
341341
public float computeFloat(K key, BiFunction<? super K, ? super Float, ? extends Float> remappingFunction) {
342342
if (key instanceof ItemConvertible ic) {
343343
Main.logger.info("Potential put detected for {}: {} with given function {}", ic,
344-
Registry.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
344+
Registries.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
345345
} else {
346346
Main.logger.info("Potential put detected for {} with given function {}", key, remappingFunction,
347347
new Throwable());
@@ -354,7 +354,7 @@ public float merge(K key, float value,
354354
BiFunction<? super Float, ? super Float, ? extends Float> remappingFunction) {
355355
if (key instanceof ItemConvertible ic) {
356356
Main.logger.info("Put detected for {}: {} -> {} with given function {}", ic, value,
357-
Registry.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
357+
Registries.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
358358
} else {
359359
Main.logger.info("Put detected for {} -> {} with given function {}", key, value, remappingFunction,
360360
new Throwable());
@@ -366,7 +366,7 @@ public float merge(K key, float value,
366366
public float mergeFloat(K key, float value, FloatBinaryOperator remappingFunction) {
367367
if (key instanceof ItemConvertible ic) {
368368
Main.logger.info("Put detected for {}: {} -> {} with given function {}", ic, value,
369-
Registry.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
369+
Registries.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
370370
} else {
371371
Main.logger.info("Put detected for {} -> {} with given function {}", key, value, remappingFunction,
372372
new Throwable());
@@ -378,7 +378,7 @@ public float mergeFloat(K key, float value, FloatBinaryOperator remappingFunctio
378378
public float mergeFloat(K key, float value, DoubleBinaryOperator remappingFunction) {
379379
if (key instanceof ItemConvertible ic) {
380380
Main.logger.info("Put detected for {}: {} -> {} with given function {}", ic, value,
381-
Registry.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
381+
Registries.ITEM.getId(ic.asItem()), remappingFunction, new Throwable());
382382
} else {
383383
Main.logger.info("Put detected for {} -> {} with given function {}", key, value, remappingFunction,
384384
new Throwable());

‎src/main/java/net/kjp12/ddc/Main.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
1313
import net.minecraft.block.ComposterBlock;
1414
import net.minecraft.item.ItemConvertible;
15-
import net.minecraft.util.registry.Registry;
15+
import net.minecraft.registry.Registries;
1616
import org.slf4j.Logger;
1717
import org.slf4j.LoggerFactory;
1818

@@ -131,7 +131,7 @@ public static void register() {
131131
var compostableItems = new Object2FloatOpenHashMap<ItemConvertible>();
132132

133133
Config.instance.compostableItems.forEach((k, v) -> {
134-
var item = Registry.ITEM.getOrEmpty(k);
134+
var item = Registries.ITEM.getOrEmpty(k);
135135
if (item.isEmpty()) {
136136
logger.warn("{} -> {} not preset at current time.", k, v);
137137
} else {

0 commit comments

Comments
 (0)