diff --git a/build.gradle b/build.gradle index e21f9a8b..f3d189ff 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.4-SNAPSHOT' + id 'fabric-loom' version '0.5-SNAPSHOT' id 'maven-publish' } @@ -10,14 +10,20 @@ archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group +repositories { + maven { url "https://maven.dblsaiko.net/" } + maven { url "http://server.bbkr.space:8081/artifactory/libs-release/" } +} + dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings "net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modCompileOnly "me.shedaniel:RoughlyEnoughItems:5.6.0" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:5.6.0" + modCompileOnly "me.shedaniel:RoughlyEnoughItems:${project.rei_version}" + modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}" + modCompile "grondag:canvas-mc116:${project.canvas_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index b46b3993..c6bc8c8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G + org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.3 - yarn_mappings=1.16.3+build.1 - loader_version=0.9.3+build.207 + minecraft_version = 1.16.3 + yarn_mappings = 28 + loader_version = 0.9.3+build.207 # Mod Properties mod_version = 1.0.0 @@ -14,4 +14,6 @@ org.gradle.jvmargs=-Xmx1G # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.20.2+build.402-1.16 + fabric_version = 0.23.0+build.410-1.16 + canvas_version = 1.0.+ + rei_version = 5.6.0 \ No newline at end of file diff --git a/src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java b/src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java index f7bed484..5f17e7a7 100644 --- a/src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java +++ b/src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java @@ -79,7 +79,7 @@ public class EndStoneSmelterRecipeBookScreen extends BlastFurnaceRecipeBookScree int slotX = this.fuelSlot.x + x; int slotY = this.fuelSlot.y + y; DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822018048); - this.client.getItemRenderer().renderInGuiWithOverrides(client.player, this.getItem().getStackForRender(), slotX, slotY); + this.client.getItemRenderer().renderInGuiWithOverrides(client.player, this.getItem().getDefaultStack(), slotX, slotY); RenderSystem.depthFunc(516); DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822083583); RenderSystem.depthFunc(515); diff --git a/src/main/java/ru/betterend/compat/REIAlloyingDisplay.java b/src/main/java/ru/betterend/compat/REIAlloyingDisplay.java index 0320ec67..30fb4ad4 100644 --- a/src/main/java/ru/betterend/compat/REIAlloyingDisplay.java +++ b/src/main/java/ru/betterend/compat/REIAlloyingDisplay.java @@ -104,7 +104,7 @@ public class REIAlloyingDisplay implements TransferRecipeDisplay { static { fuel = EndStoneSmelterBlockEntity.availableFuels().keySet().stream() - .map(Item::getStackForRender).map(EntryStack::create) + .map(Item::getDefaultStack).map(EntryStack::create) .map(e -> e.setting(EntryStack.Settings.TOOLTIP_APPEND_EXTRA, stack -> Collections.singletonList(new TranslatableText("category.rei.smelting.fuel") .formatted(Formatting.YELLOW)))).collect(Collectors.toList()); } diff --git a/src/main/java/ru/betterend/world/biome/BiomeDefinition.java b/src/main/java/ru/betterend/world/biome/BiomeDefinition.java index aa43737f..68bf97ba 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeDefinition.java +++ b/src/main/java/ru/betterend/world/biome/BiomeDefinition.java @@ -62,7 +62,7 @@ public class BiomeDefinition { } public BiomeDefinition setSurface(Block surfaceBlock) { - this.surface = SurfaceBuilder.DEFAULT.method_30478(new TernarySurfaceConfig( + this.surface = SurfaceBuilder.DEFAULT.withConfig(new TernarySurfaceConfig( surfaceBlock.getDefaultState(), Blocks.END_STONE.getDefaultState(), Blocks.END_STONE.getDefaultState() @@ -79,7 +79,7 @@ public class BiomeDefinition { surfaceBlock2.getDefaultState(), Blocks.END_STONE.getDefaultState(), Blocks.END_STONE.getDefaultState() - )).method_30478(new TernarySurfaceConfig(surfaceBlock1.getDefaultState(), + )).withConfig(new TernarySurfaceConfig(surfaceBlock1.getDefaultState(), Blocks.END_STONE.getDefaultState(), Blocks.END_STONE.getDefaultState())); return this;