MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update fabric, mappings and loom. Added Canvas library.

Browse source
This commit is contained in:
Aleksey 2020-10-06 22:00:46 +03:00
parent 50f93efbf9
commit b36aae9e8b
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
build.gradle
View file

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '0.4-SNAPSHOT' id 'fabric-loom' version '0.5-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
@ -10,14 +10,20 @@ archivesBaseName = project.archives_base_name
version = project.mod_version version = project.mod_version
group = project.maven_group group = project.maven_group
repositories {
maven { url "https://maven.dblsaiko.net/" }
maven { url "http://server.bbkr.space:8081/artifactory/libs-release/" }
}
dependencies { dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}" 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-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modCompileOnly "me.shedaniel:RoughlyEnoughItems:5.6.0" modCompileOnly "me.shedaniel:RoughlyEnoughItems:${project.rei_version}"
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:5.6.0" modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}"
modCompile "grondag:canvas-mc116:${project.canvas_version}"
} }
processResources { processResources {

12
gradle.properties
View file

@ -1,11 +1,11 @@
# Done to increase the memory available to gradle. # Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx2G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.16.3 minecraft_version = 1.16.3
yarn_mappings=1.16.3+build.1 yarn_mappings = 28
loader_version=0.9.3+build.207 loader_version = 0.9.3+build.207
# Mod Properties # Mod Properties
mod_version = 1.0.0 mod_version = 1.0.0
@ -14,4 +14,6 @@ org.gradle.jvmargs=-Xmx1G
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # 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

2
src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java
View file

@ -79,7 +79,7 @@ public class EndStoneSmelterRecipeBookScreen extends BlastFurnaceRecipeBookScree
int slotX = this.fuelSlot.x + x; int slotX = this.fuelSlot.x + x;
int slotY = this.fuelSlot.y + y; int slotY = this.fuelSlot.y + y;
DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822018048); 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); RenderSystem.depthFunc(516);
DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822083583); DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822083583);
RenderSystem.depthFunc(515); RenderSystem.depthFunc(515);

2
src/main/java/ru/betterend/compat/REIAlloyingDisplay.java
View file

@ -104,7 +104,7 @@ public class REIAlloyingDisplay implements TransferRecipeDisplay {
static { static {
fuel = EndStoneSmelterBlockEntity.availableFuels().keySet().stream() 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") .map(e -> e.setting(EntryStack.Settings.TOOLTIP_APPEND_EXTRA, stack -> Collections.singletonList(new TranslatableText("category.rei.smelting.fuel")
.formatted(Formatting.YELLOW)))).collect(Collectors.toList()); .formatted(Formatting.YELLOW)))).collect(Collectors.toList());
} }

4
src/main/java/ru/betterend/world/biome/BiomeDefinition.java
View file

@ -62,7 +62,7 @@ public class BiomeDefinition {
} }
public BiomeDefinition setSurface(Block surfaceBlock) { public BiomeDefinition setSurface(Block surfaceBlock) {
this.surface = SurfaceBuilder.DEFAULT.method_30478(new TernarySurfaceConfig( this.surface = SurfaceBuilder.DEFAULT.withConfig(new TernarySurfaceConfig(
surfaceBlock.getDefaultState(), surfaceBlock.getDefaultState(),
Blocks.END_STONE.getDefaultState(), Blocks.END_STONE.getDefaultState(),
Blocks.END_STONE.getDefaultState() Blocks.END_STONE.getDefaultState()
@ -79,7 +79,7 @@ public class BiomeDefinition {
surfaceBlock2.getDefaultState(), surfaceBlock2.getDefaultState(),
Blocks.END_STONE.getDefaultState(), Blocks.END_STONE.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(),
Blocks.END_STONE.getDefaultState())); Blocks.END_STONE.getDefaultState()));
return this; return this;