Update deps and mappings.
This commit is contained in:
parent
b0ddb4cc95
commit
0ba85b37cc
22 changed files with 108 additions and 110 deletions
|
@ -15,12 +15,12 @@ import net.minecraft.client.util.math.MatrixStack;
|
|||
import net.minecraft.fluid.FluidState;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.random.AbstractRandom;
|
||||
import net.minecraft.util.math.random.Random;
|
||||
import net.minecraft.world.BlockRenderView;
|
||||
import net.minecraft.world.BlockView;
|
||||
import reborncore.common.blockentity.MultiblockWriter;
|
||||
|
||||
import java.util.Random;
|
||||
import net.minecraft.util.math.random.Random;
|
||||
import java.util.function.BiPredicate;
|
||||
|
||||
/**
|
||||
|
@ -47,7 +47,7 @@ record HologramRenderer(BlockRenderView view, MatrixStack matrix, VertexConsumer
|
|||
} else {
|
||||
matrix.translate(-0.5, -0.5, -0.5);
|
||||
VertexConsumer consumer = vertexConsumerProvider.getBuffer(RenderLayers.getBlockLayer(state));
|
||||
blockRenderManager.renderBlock(state, OUT_OF_WORLD_POS, view, matrix, consumer, false, AbstractRandom.create());
|
||||
blockRenderManager.renderBlock(state, OUT_OF_WORLD_POS, view, matrix, consumer, false, Random.create());
|
||||
}
|
||||
|
||||
matrix.pop();
|
||||
|
|
|
@ -29,10 +29,10 @@ import com.mojang.brigadier.Command;
|
|||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import com.mojang.brigadier.suggestion.SuggestionProvider;
|
||||
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
|
||||
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.minecraft.command.CommandRegistryAccess;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import net.minecraft.command.argument.EntityArgumentType;
|
||||
import net.minecraft.command.argument.ItemStackArgumentType;
|
||||
|
@ -72,10 +72,10 @@ public class RebornCoreCommands {
|
|||
CommandSource.suggestMatching(FabricLoader.getInstance().getAllMods().stream().map(modContainer -> modContainer.getMetadata().getId()), builder);
|
||||
|
||||
public static void setup() {
|
||||
CommandRegistrationCallback.EVENT.register(((dispatcher, isDedicated) -> RebornCoreCommands.addCommands(dispatcher)));
|
||||
CommandRegistrationCallback.EVENT.register((RebornCoreCommands::addCommands));
|
||||
}
|
||||
|
||||
private static void addCommands(CommandDispatcher<ServerCommandSource> dispatcher) {
|
||||
private static void addCommands(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess registryAccess, CommandManager.RegistrationEnvironment environment) {
|
||||
dispatcher.register(
|
||||
literal("reborncore")
|
||||
|
||||
|
@ -108,14 +108,13 @@ public class RebornCoreCommands {
|
|||
.executes(RebornCoreCommands::renderMod)
|
||||
)
|
||||
)
|
||||
// TODO 1.19: Waiting on https://github.com/FabricMC/fabric/pull/2227
|
||||
// .then(
|
||||
// literal("item")
|
||||
// .then(
|
||||
// argument("item", ItemStackArgumentType.itemStack())
|
||||
// .executes(RebornCoreCommands::itemRenderer)
|
||||
// )
|
||||
// )
|
||||
.then(
|
||||
literal("item")
|
||||
.then(
|
||||
argument("item", ItemStackArgumentType.itemStack(registryAccess))
|
||||
.executes(RebornCoreCommands::itemRenderer)
|
||||
)
|
||||
)
|
||||
.then(
|
||||
literal("hand")
|
||||
.executes(RebornCoreCommands::handRenderer)
|
||||
|
|
|
@ -3,11 +3,10 @@ package reborncore.common.util;
|
|||
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemConvertible;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.util.math.random.AbstractRandom;
|
||||
import net.minecraft.util.math.random.Random;
|
||||
import net.minecraft.village.TradeOffer;
|
||||
import net.minecraft.village.TradeOffers;
|
||||
import net.minecraft.village.VillagerProfession;
|
||||
|
@ -15,7 +14,6 @@ import org.jetbrains.annotations.Contract;
|
|||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Random;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public final class TradeUtils {
|
||||
|
@ -57,7 +55,7 @@ public final class TradeUtils {
|
|||
|
||||
@Nullable
|
||||
@Override
|
||||
public TradeOffer create(Entity entity, AbstractRandom random) {
|
||||
public TradeOffer create(Entity entity, Random random) {
|
||||
return copy(offer);
|
||||
}
|
||||
};
|
||||
|
|
|
@ -34,7 +34,7 @@ import net.minecraft.util.math.Vec3d;
|
|||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import net.minecraft.util.math.random.Random;
|
||||
|
||||
/**
|
||||
* Created by Mark on 13/03/2016.
|
||||
|
@ -59,7 +59,7 @@ public class WorldUtils {
|
|||
|
||||
|
||||
public static void dropItem(ItemStack itemStack, World world, BlockPos pos) {
|
||||
Random rand = new Random();
|
||||
Random rand = Random.create();
|
||||
|
||||
float dX = rand.nextFloat() * 0.8F + 0.1F;
|
||||
float dY = rand.nextFloat() * 0.8F + 0.1F;
|
||||
|
|
|
@ -1,49 +1,52 @@
|
|||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "reborncore",
|
||||
"version": "${version}",
|
||||
"name": "Reborn Core",
|
||||
"icon": "assets/reborncore/icon.png",
|
||||
"description": "Reborn Core is a library used for many of the Tech Reborn team's mods, including Tech Reborn, Quantum Storage, Fluxed Redstone, Hardcore Map Reset, and many more.",
|
||||
"license": "MIT",
|
||||
"contact": {
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/reborncore",
|
||||
"sources": "https://github.com/TechReborn/RebornCore",
|
||||
"issues": "https://github.com/TechReborn/RebornCore/issues"
|
||||
},
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"main": [
|
||||
"reborncore.RebornCore"
|
||||
],
|
||||
"client": [
|
||||
"reborncore.RebornCoreClient"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"reborncore.client.mixins.json",
|
||||
"reborncore.common.mixins.json"
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.14.6",
|
||||
"fabric": ">=0.52.4",
|
||||
"team_reborn_energy": ">=2.2.0",
|
||||
"fabric-biome-api-v1": ">=3.0.0",
|
||||
"minecraft": "~1.19-beta.1"
|
||||
},
|
||||
"authors": [
|
||||
"Team Reborn",
|
||||
"modmuss50",
|
||||
"drcrazy"
|
||||
],
|
||||
"contributors": [
|
||||
"Gigabit101",
|
||||
"Prospector",
|
||||
"Rushmead",
|
||||
"Dragon2488",
|
||||
"Ourten",
|
||||
"coderbot",
|
||||
"estebes"
|
||||
],
|
||||
"accessWidener": "reborncore.accesswidener"
|
||||
"schemaVersion": 1,
|
||||
"id": "reborncore",
|
||||
"version": "${version}",
|
||||
"name": "Reborn Core",
|
||||
"icon": "assets/reborncore/icon.png",
|
||||
"description": "Reborn Core is a library used for many of the Tech Reborn team's mods, including Tech Reborn, Quantum Storage, Fluxed Redstone, Hardcore Map Reset, and many more.",
|
||||
"license": "MIT",
|
||||
"contact": {
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/reborncore",
|
||||
"sources": "https://github.com/TechReborn/RebornCore",
|
||||
"issues": "https://github.com/TechReborn/RebornCore/issues"
|
||||
},
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"main": [
|
||||
"reborncore.RebornCore"
|
||||
],
|
||||
"client": [
|
||||
"reborncore.RebornCoreClient"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"reborncore.common.mixins.json",
|
||||
{
|
||||
"config": "reborncore.client.mixins.json",
|
||||
"environment": "client"
|
||||
}
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.14.6",
|
||||
"fabric": ">=0.52.4",
|
||||
"team_reborn_energy": ">=2.2.0",
|
||||
"fabric-biome-api-v1": ">=3.0.0",
|
||||
"minecraft": "~1.19-beta.1"
|
||||
},
|
||||
"authors": [
|
||||
"Team Reborn",
|
||||
"modmuss50",
|
||||
"drcrazy"
|
||||
],
|
||||
"contributors": [
|
||||
"Gigabit101",
|
||||
"Prospector",
|
||||
"Rushmead",
|
||||
"Dragon2488",
|
||||
"Ourten",
|
||||
"coderbot",
|
||||
"estebes"
|
||||
],
|
||||
"accessWidener": "reborncore.accesswidener"
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue