diff --git a/RebornCore/src/main/java/reborncore/common/RebornCoreCommands.java b/RebornCore/src/main/java/reborncore/common/RebornCoreCommands.java index 6deea7900..9e7213b91 100644 --- a/RebornCore/src/main/java/reborncore/common/RebornCoreCommands.java +++ b/RebornCore/src/main/java/reborncore/common/RebornCoreCommands.java @@ -137,7 +137,7 @@ public class RebornCoreCommands { CompletableFuture.supplyAsync(() -> serverChunkManager.getChunk(chunkPosX, chunkPosZ, ChunkStatus.FULL, true), EXECUTOR_SERVICE) .whenComplete((chunk, throwable) -> { int max = (int) Math.pow(size, 2); - ctx.getSource().sendFeedback(Text.literal(String.format("Finished generating %d:%d (%d/%d %d%%)", chunk.getPos().x, chunk.getPos().z, completed.getAndIncrement(), max, completed.get() == 0 ? 0 : (int) ((completed.get() * 100.0f) / max))), true); + ctx.getSource().sendFeedback(() -> Text.literal(String.format("Finished generating %d:%d (%d/%d %d%%)", chunk.getPos().x, chunk.getPos().z, completed.getAndIncrement(), max, completed.get() == 0 ? 0 : (int) ((completed.get() * 100.0f) / max))), true); } ); } diff --git a/RebornCore/src/main/resources/reborncore.accesswidener b/RebornCore/src/main/resources/reborncore.accesswidener index 3cae7fb88..248d484b6 100644 --- a/RebornCore/src/main/resources/reborncore.accesswidener +++ b/RebornCore/src/main/resources/reborncore.accesswidener @@ -33,4 +33,6 @@ accessible method net/minecraft/world/gen/foliage/FoliagePlacerType reg accessible method net/minecraft/recipe/RecipeManager getAllOfType (Lnet/minecraft/recipe/RecipeType;)Ljava/util/Map; accessible field net/minecraft/screen/ScreenHandler listeners Ljava/util/List; -accessible field net/minecraft/structure/pool/StructurePool elements Lit/unimi/dsi/fastutil/objects/ObjectArrayList; \ No newline at end of file +accessible field net/minecraft/structure/pool/StructurePool elements Lit/unimi/dsi/fastutil/objects/ObjectArrayList; + +accessible method net/minecraft/block/CropBlock getAgeProperty ()Lnet/minecraft/state/property/IntProperty; \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 733f5be0e..c27a5d438 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,10 +7,10 @@ mod_version=5.7.0 # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20-pre1 -yarn_version=1.20-pre1+build.7 +minecraft_version=1.20-pre2 +yarn_version=1.20-pre2+build.1 loader_version=0.14.19 -fapi_version=0.80.3+1.20 +fapi_version=0.81.2+1.20 # Dependencies energy_version=3.0.0 diff --git a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java index ad3dfdf1a..547224cff 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java @@ -96,8 +96,8 @@ public class GreenhouseControllerBlockEntity extends PowerAcceptorBlockEntity } } - if (block instanceof CropBlock) { - processAgedCrop(blockState, blockPos, ((CropBlock) block).getAgeProperty(), ((CropBlock) block).getMaxAge(), 0); + if (block instanceof CropBlock cropBlock) { + processAgedCrop(blockState, blockPos, cropBlock.getAgeProperty(), ((CropBlock) block).getMaxAge(), 0); } else if (block instanceof NetherWartBlock) { processAgedCrop(blockState, blockPos, NetherWartBlock.AGE, 3, 0); } else if (block instanceof SweetBerryBushBlock) { diff --git a/src/main/java/techreborn/init/template/TechRebornTemplates.java b/src/main/java/techreborn/init/template/TechRebornTemplates.java index 62dd22b3a..8b8f6d849 100644 --- a/src/main/java/techreborn/init/template/TechRebornTemplates.java +++ b/src/main/java/techreborn/init/template/TechRebornTemplates.java @@ -73,7 +73,7 @@ public class TechRebornTemplates { return 0; } - ctx.getSource().sendFeedback(Text.literal("done"), true); + ctx.getSource().sendFeedback(() -> Text.literal("done"), true); return Command.SINGLE_SUCCESS; } diff --git a/src/main/resources/techreborn.accesswidener b/src/main/resources/techreborn.accesswidener index c21d3dabb..13c7c5ccb 100644 --- a/src/main/resources/techreborn.accesswidener +++ b/src/main/resources/techreborn.accesswidener @@ -35,4 +35,6 @@ accessible field net/minecraft/screen/ScreenHandler listeners Ljava/ accessible field net/minecraft/structure/pool/StructurePool elements Lit/unimi/dsi/fastutil/objects/ObjectArrayList; +accessible method net/minecraft/block/CropBlock getAgeProperty ()Lnet/minecraft/state/property/IntProperty; + # DO NOT EDIT THIS FILE, edit the RebornCore AW, it will automatically be coped to this one. \ No newline at end of file