maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1.20-pre2

Browse source
This commit is contained in:
modmuss50 2023-05-16 19:55:34 +01:00 committed by modmuss
parent 8f8de066f6
commit 91df771011
6 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RebornCore/src/main/java/reborncore/common/RebornCoreCommands.java
View file

@ -137,7 +137,7 @@ public class RebornCoreCommands {
CompletableFuture.supplyAsync(() -> serverChunkManager.getChunk(chunkPosX, chunkPosZ, ChunkStatus.FULL, true), EXECUTOR_SERVICE) CompletableFuture.supplyAsync(() -> serverChunkManager.getChunk(chunkPosX, chunkPosZ, ChunkStatus.FULL, true), EXECUTOR_SERVICE)
.whenComplete((chunk, throwable) -> { .whenComplete((chunk, throwable) -> {
int max = (int) Math.pow(size, 2); 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);
} }
); );
} }

2
RebornCore/src/main/resources/reborncore.accesswidener
View file

@ -34,3 +34,5 @@ accessible method net/minecraft/recipe/RecipeManager getAllOfType (L
accessible field net/minecraft/screen/ScreenHandler listeners Ljava/util/List; accessible field net/minecraft/screen/ScreenHandler listeners Ljava/util/List;
accessible field net/minecraft/structure/pool/StructurePool elements Lit/unimi/dsi/fastutil/objects/ObjectArrayList; 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;

6
gradle.properties
View file

@ -7,10 +7,10 @@ mod_version=5.7.0
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.20-pre1 minecraft_version=1.20-pre2
yarn_version=1.20-pre1+build.7 yarn_version=1.20-pre2+build.1
loader_version=0.14.19 loader_version=0.14.19
fapi_version=0.80.3+1.20 fapi_version=0.81.2+1.20
# Dependencies # Dependencies
energy_version=3.0.0 energy_version=3.0.0

4
src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java
View file

@ -96,8 +96,8 @@ public class GreenhouseControllerBlockEntity extends PowerAcceptorBlockEntity
} }
} }
if (block instanceof CropBlock) { if (block instanceof CropBlock cropBlock) {
processAgedCrop(blockState, blockPos, ((CropBlock) block).getAgeProperty(), ((CropBlock) block).getMaxAge(), 0); processAgedCrop(blockState, blockPos, cropBlock.getAgeProperty(), ((CropBlock) block).getMaxAge(), 0);
} else if (block instanceof NetherWartBlock) { } else if (block instanceof NetherWartBlock) {
processAgedCrop(blockState, blockPos, NetherWartBlock.AGE, 3, 0); processAgedCrop(blockState, blockPos, NetherWartBlock.AGE, 3, 0);
} else if (block instanceof SweetBerryBushBlock) { } else if (block instanceof SweetBerryBushBlock) {

2
src/main/java/techreborn/init/template/TechRebornTemplates.java
View file

@ -73,7 +73,7 @@ public class TechRebornTemplates {
return 0; return 0;
} }
ctx.getSource().sendFeedback(Text.literal("done"), true); ctx.getSource().sendFeedback(() -> Text.literal("done"), true);
return Command.SINGLE_SUCCESS; return Command.SINGLE_SUCCESS;
} }

2
src/main/resources/techreborn.accesswidener
View file

@ -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 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. # DO NOT EDIT THIS FILE, edit the RebornCore AW, it will automatically be coped to this one.