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

Fixed water rendering, duplicate ID and missing hammer tag

Browse source
This commit is contained in:
paulevsGitch 2021-07-09 03:16:49 +03:00
parent ea9b3c72a4
commit b05f2fcf57
3 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ru/betterend/blocks/complex/MetalMaterial.java
View file

@ -225,5 +225,6 @@ public class MetalMaterial {
TagHelper.addTag(BlockTags.BEACON_BASE_BLOCKS, block); TagHelper.addTag(BlockTags.BEACON_BASE_BLOCKS, block);
TagHelper.addTag(ItemTags.BEACON_PAYMENT_ITEMS, ingot); TagHelper.addTag(ItemTags.BEACON_PAYMENT_ITEMS, ingot);
TagHelper.addTag(TagAPI.DRAGON_IMMUNE, ore, bars); TagHelper.addTag(TagAPI.DRAGON_IMMUNE, ore, bars);
TagHelper.addTag(TagAPI.HAMMERS, hammer);
} }
} }

26
src/main/java/ru/betterend/mixin/client/BiomeColorsMixin.java
View file

@ -13,10 +13,13 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import ru.bclib.util.BlocksHelper; import ru.bclib.util.BlocksHelper;
import ru.bclib.util.ColorUtil; import ru.bclib.util.ColorUtil;
import ru.bclib.util.MHelper;
import ru.betterend.client.ClientOptions; import ru.betterend.client.ClientOptions;
import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndBlocks;
import java.awt.Point; import java.awt.Point;
import java.util.Arrays;
import java.util.Comparator;
@Mixin(BiomeColors.class) @Mixin(BiomeColors.class)
public class BiomeColorsMixin { public class BiomeColorsMixin {
@ -35,8 +38,7 @@ public class BiomeColorsMixin {
mut.setX(pos.getX() + OFFSETS[i].x); mut.setX(pos.getX() + OFFSETS[i].x);
mut.setZ(pos.getZ() + OFFSETS[i].y); mut.setZ(pos.getZ() + OFFSETS[i].y);
if ((view.getBlockState(mut).is(EndBlocks.BRIMSTONE))) { if ((view.getBlockState(mut).is(EndBlocks.BRIMSTONE))) {
info.setReturnValue(i < 16 ? STREAM_COLOR : POISON_COLOR); info.setReturnValue(i < 4 ? POISON_COLOR : STREAM_COLOR);
info.cancel();
return; return;
} }
} }
@ -46,21 +48,15 @@ public class BiomeColorsMixin {
static { static {
HAS_SODIUM = FabricLoader.getInstance().isModLoaded("sodium"); HAS_SODIUM = FabricLoader.getInstance().isModLoaded("sodium");
int index = 0;
OFFSETS = new Point[20]; OFFSETS = new Point[20];
for (int i = 0; i < 3; i++) { for (int x = -2; x < 3; x++) {
int p = i - 1; for (int z = -2; z < 3; z++) {
OFFSETS[i] = new Point(p, -2); if ((x != 0 || z != 0) && (Math.abs(x) != 2 || Math.abs(z) != 2)) {
OFFSETS[i + 3] = new Point(p, 2); OFFSETS[index++] = new Point(x, z);
OFFSETS[i + 6] = new Point(-2, p);
OFFSETS[i + 9] = new Point(2, p);
} }
for (int i = 0; i < 4; i++) {
int inner = i + 16;
Direction dir = BlocksHelper.HORIZONTAL[i];
OFFSETS[inner] = new Point(dir.getStepX(), dir.getStepZ());
dir = BlocksHelper.HORIZONTAL[(i + 1) & 3];
OFFSETS[i + 12] = new Point(OFFSETS[inner].x + dir.getStepX(), OFFSETS[inner].y + dir.getStepZ());
} }
} }
Arrays.sort(OFFSETS, Comparator.comparingInt(pos -> MHelper.sqr(pos.x) + MHelper.sqr(pos.y)));
}
} }

2
src/main/java/ru/betterend/recipe/AlloyingRecipes.java
View file

@ -19,7 +19,7 @@ public class AlloyingRecipes {
.setOutput(Items.GOLD_INGOT, 3) .setOutput(Items.GOLD_INGOT, 3)
.setExpiriense(3F) .setExpiriense(3F)
.build(); .build();
AlloyingRecipe.Builder.create("additional_gold") AlloyingRecipe.Builder.create("additional_copper")
.setInput(EndTags.ALLOYING_COPPER, EndTags.ALLOYING_COPPER) .setInput(EndTags.ALLOYING_COPPER, EndTags.ALLOYING_COPPER)
.setOutput(Items.COPPER_INGOT, 3) .setOutput(Items.COPPER_INGOT, 3)
.setExpiriense(3F) .setExpiriense(3F)