first pass on 1.16.2 - no world gen
This commit is contained in:
parent
ec1ae17134
commit
6e0fc6af61
49 changed files with 139 additions and 138 deletions
12
build.gradle
12
build.gradle
|
@ -10,7 +10,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "net.fabricmc:fabric-loom:0.4-SNAPSHOT"
|
classpath "net.fabricmc:fabric-loom:0.5-SNAPSHOT"
|
||||||
classpath "gradle.plugin.net.minecrell:licenser:0.2.1"
|
classpath "gradle.plugin.net.minecrell:licenser:0.2.1"
|
||||||
classpath 'de.undercouch:gradle-download-task:3.4.3'
|
classpath 'de.undercouch:gradle-download-task:3.4.3'
|
||||||
}
|
}
|
||||||
|
@ -73,14 +73,14 @@ configurations.all {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft "com.mojang:minecraft:1.16.1"
|
minecraft "com.mojang:minecraft:1.16.2-pre1"
|
||||||
mappings "net.fabricmc:yarn:1.16.1+build.1:v2"
|
mappings "net.fabricmc:yarn:1.16.2-pre1+build.1:v2"
|
||||||
modImplementation "net.fabricmc:fabric-loader:0.9.0+build.204"
|
modImplementation "net.fabricmc:fabric-loader:0.9.0+build.204"
|
||||||
|
|
||||||
//Fabric api
|
//Fabric api
|
||||||
modImplementation "net.fabricmc.fabric-api:fabric-api:0.16.0+build.384-1.16.1"
|
modImplementation "net.fabricmc.fabric-api:fabric-api:0.16.1+build.387-1.16"
|
||||||
|
|
||||||
optionalDependency ("me.shedaniel:RoughlyEnoughItems:4.10.2")
|
disabledOptionalDependency ("me.shedaniel:RoughlyEnoughItems:4.10.2")
|
||||||
disabledOptionalDependency ('io.github.cottonmc:LibCD:2.4.1+1.15.2')
|
disabledOptionalDependency ('io.github.cottonmc:LibCD:2.4.1+1.15.2')
|
||||||
disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.0')
|
disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.0')
|
||||||
|
|
||||||
|
@ -90,8 +90,6 @@ dependencies {
|
||||||
}
|
}
|
||||||
include rcVersion
|
include rcVersion
|
||||||
|
|
||||||
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
|
|
||||||
|
|
||||||
modApi 'teamreborn:energy:0.1.0'
|
modApi 'teamreborn:energy:0.1.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
@ -69,7 +69,7 @@ import techreborn.items.armor.BatpackItem;
|
||||||
import techreborn.items.tool.ChainsawItem;
|
import techreborn.items.tool.ChainsawItem;
|
||||||
import techreborn.items.tool.industrial.NanosaberItem;
|
import techreborn.items.tool.industrial.NanosaberItem;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
package techreborn.api.generator;
|
package techreborn.api.generator;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public enum EFluidGenerator {
|
public enum EFluidGenerator {
|
||||||
THERMAL("TechReborn.ThermalGenerator"),
|
THERMAL("TechReborn.ThermalGenerator"),
|
||||||
|
@ -33,14 +33,14 @@ public enum EFluidGenerator {
|
||||||
SEMIFLUID("TechReborn.SemifluidGenerator"),
|
SEMIFLUID("TechReborn.SemifluidGenerator"),
|
||||||
PLASMA("TechReborn.PlasmaGenerator");
|
PLASMA("TechReborn.PlasmaGenerator");
|
||||||
|
|
||||||
@Nonnull
|
@NotNull
|
||||||
private final String recipeID;
|
private final String recipeID;
|
||||||
|
|
||||||
EFluidGenerator(@Nonnull String recipeID) {
|
EFluidGenerator(@NotNull String recipeID) {
|
||||||
this.recipeID = recipeID;
|
this.recipeID = recipeID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@NotNull
|
||||||
public String getRecipeID() {
|
public String getRecipeID() {
|
||||||
return recipeID;
|
return recipeID;
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,7 @@ import reborncore.common.util.serialization.SerializationUtil;
|
||||||
import techreborn.blockentity.machine.GenericMachineBlockEntity;
|
import techreborn.blockentity.machine.GenericMachineBlockEntity;
|
||||||
import techreborn.init.ModRecipes;
|
import techreborn.init.ModRecipes;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
@ -45,7 +45,7 @@ import techreborn.api.generator.FluidGeneratorRecipeList;
|
||||||
import techreborn.api.generator.GeneratorRecipeHelper;
|
import techreborn.api.generator.GeneratorRecipeHelper;
|
||||||
import techreborn.utils.FluidUtils;
|
import techreborn.utils.FluidUtils;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider {
|
public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider {
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ import techreborn.config.TechRebornConfig;
|
||||||
import techreborn.init.TRBlockEntities;
|
import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
|
public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
|
||||||
|
@ -63,7 +63,7 @@ public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity impl
|
||||||
super(TRBlockEntities.SOLID_FUEL_GENEREATOR);
|
super(TRBlockEntities.SOLID_FUEL_GENEREATOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getItemBurnTime(@Nonnull ItemStack stack) {
|
public static int getItemBurnTime(@NotNull ItemStack stack) {
|
||||||
if (stack.isEmpty()) {
|
if (stack.isEmpty()) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,7 @@ import reborncore.common.fluid.container.FluidInstance;
|
||||||
import reborncore.common.util.Tank;
|
import reborncore.common.util.Tank;
|
||||||
import techreborn.init.TRBlockEntities;
|
import techreborn.init.TRBlockEntities;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public class DrainBlockEntity extends MachineBaseBlockEntity {
|
public class DrainBlockEntity extends MachineBaseBlockEntity {
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.FluidUtils;
|
import techreborn.utils.FluidUtils;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author drcrazy
|
* @author drcrazy
|
||||||
|
|
|
@ -45,7 +45,7 @@ import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.FluidUtils;
|
import techreborn.utils.FluidUtils;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
|
public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.FluidUtils;
|
import techreborn.utils.FluidUtils;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
|
public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider {
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ import techreborn.init.ModSounds;
|
||||||
import techreborn.init.TRBlockEntities;
|
import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
@ -49,7 +49,7 @@ import techreborn.init.ModRecipes;
|
||||||
import techreborn.init.TRBlockEntities;
|
import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -66,7 +66,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity
|
||||||
public RebornInventory<RollingMachineBlockEntity> inventory = new RebornInventory<>(12, "RollingMachineBlockEntity", 64, this);
|
public RebornInventory<RollingMachineBlockEntity> inventory = new RebornInventory<>(12, "RollingMachineBlockEntity", 64, this);
|
||||||
public boolean isRunning;
|
public boolean isRunning;
|
||||||
public int tickTime;
|
public int tickTime;
|
||||||
@Nonnull
|
@NotNull
|
||||||
public ItemStack currentRecipeOutput;
|
public ItemStack currentRecipeOutput;
|
||||||
public RollingMachineRecipe currentRecipe;
|
public RollingMachineRecipe currentRecipe;
|
||||||
private final int outputSlot;
|
private final int outputSlot;
|
||||||
|
|
|
@ -46,7 +46,7 @@ import techreborn.config.TechRebornConfig;
|
||||||
import techreborn.init.TRBlockEntities;
|
import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
|
public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider {
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.world.PersistentState;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import reborncore.common.util.NBTSerializable;
|
import reborncore.common.util.NBTSerializable;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
||||||
public class IDSUManager extends PersistentState {
|
public class IDSUManager extends PersistentState {
|
||||||
|
@ -41,7 +41,7 @@ public class IDSUManager extends PersistentState {
|
||||||
super(KEY);
|
super(KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@NotNull
|
||||||
public static IDSUPlayer getPlayer(World world, String uuid) {
|
public static IDSUPlayer getPlayer(World world, String uuid) {
|
||||||
return get(world).getPlayer(uuid);
|
return get(world).getPlayer(uuid);
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ public class IDSUManager extends PersistentState {
|
||||||
|
|
||||||
private final HashMap<String, IDSUPlayer> playerHashMap = new HashMap<>();
|
private final HashMap<String, IDSUPlayer> playerHashMap = new HashMap<>();
|
||||||
|
|
||||||
@Nonnull
|
@NotNull
|
||||||
public IDSUPlayer getPlayer(String uuid) {
|
public IDSUPlayer getPlayer(String uuid) {
|
||||||
return playerHashMap.computeIfAbsent(uuid, s -> new IDSUPlayer());
|
return playerHashMap.computeIfAbsent(uuid, s -> new IDSUPlayer());
|
||||||
}
|
}
|
||||||
|
@ -82,7 +82,7 @@ public class IDSUManager extends PersistentState {
|
||||||
read(compoundTag);
|
read(compoundTag);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public CompoundTag write() {
|
public CompoundTag write() {
|
||||||
CompoundTag tag = new CompoundTag();
|
CompoundTag tag = new CompoundTag();
|
||||||
|
@ -91,7 +91,7 @@ public class IDSUManager extends PersistentState {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void read(@Nonnull CompoundTag tag) {
|
public void read(@NotNull CompoundTag tag) {
|
||||||
energy = tag.getDouble("energy");
|
energy = tag.getDouble("energy");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.FluidUtils;
|
import techreborn.utils.FluidUtils;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider {
|
public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider {
|
||||||
|
@ -164,7 +164,7 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I
|
||||||
.sync(tank).addInventory().create(this, syncID);
|
.sync(tank).addInventory().create(this, syncID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public Tank getTank() {
|
public Tank getTank() {
|
||||||
return tank;
|
return tank;
|
||||||
|
|
|
@ -48,7 +48,7 @@ import reborncore.common.util.WorldUtils;
|
||||||
import techreborn.init.TRBlockEntities;
|
import techreborn.init.TRBlockEntities;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider {
|
public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider {
|
||||||
|
|
|
@ -61,7 +61,7 @@ import techreborn.init.ModSounds;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.damageSources.ElectrialShockSource;
|
import techreborn.utils.damageSources.ElectrialShockSource;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ import net.minecraft.world.World;
|
||||||
import reborncore.api.ToolManager;
|
import reborncore.api.ToolManager;
|
||||||
import techreborn.init.ModSounds;
|
import techreborn.init.ModSounds;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class BlockFusionCoil extends Block {
|
public class BlockFusionCoil extends Block {
|
||||||
|
@ -80,9 +80,9 @@ public class BlockFusionCoil extends Block {
|
||||||
|
|
||||||
@Environment(EnvType.CLIENT)
|
@Environment(EnvType.CLIENT)
|
||||||
@Override
|
@Override
|
||||||
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip,
|
public void appendTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip,
|
||||||
TooltipContext flagIn) {
|
TooltipContext flagIn) {
|
||||||
super.buildTooltip(stack, worldIn, tooltip, flagIn);
|
super.appendTooltip(stack, worldIn, tooltip, flagIn);
|
||||||
// TODO: Translate
|
// TODO: Translate
|
||||||
tooltip.add(new LiteralText("Right click Fusion Control computer to auto place"));
|
tooltip.add(new LiteralText("Right click Fusion Control computer to auto place"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,7 @@ import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.util.WrenchUtils;
|
import reborncore.common.util.WrenchUtils;
|
||||||
import techreborn.blockentity.lighting.LampBlockEntity;
|
import techreborn.blockentity.lighting.LampBlockEntity;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public class BlockLamp extends BaseBlockEntityProvider {
|
public class BlockLamp extends BaseBlockEntityProvider {
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.util.WrenchUtils;
|
import reborncore.common.util.WrenchUtils;
|
||||||
import techreborn.blockentity.machine.misc.AlarmBlockEntity;
|
import techreborn.blockentity.machine.misc.AlarmBlockEntity;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class BlockAlarm extends BaseBlockEntityProvider {
|
public class BlockAlarm extends BaseBlockEntityProvider {
|
||||||
|
@ -161,7 +161,7 @@ public class BlockAlarm extends BaseBlockEntityProvider {
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
|
public void appendTooltip(ItemStack stack, @Nullable BlockView worldIn, List<Text> tooltip, TooltipContext flagIn) {
|
||||||
tooltip.add(new TranslatableText("techreborn.tooltip.alarm").formatted(Formatting.GRAY));
|
tooltip.add(new TranslatableText("techreborn.tooltip.alarm").formatted(Formatting.GRAY));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity;
|
||||||
import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity;
|
import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity;
|
||||||
import techreborn.client.gui.*;
|
import techreborn.client.gui.*;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
|
@ -74,7 +74,7 @@ public class GuiGreenhouseController extends GuiBase<BuiltScreenHandler> {
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
matrixStack.push();
|
matrixStack.push();
|
||||||
renderTooltip(matrixStack, list, mouseX, mouseY);
|
method_30901(matrixStack, list, mouseX, mouseY);
|
||||||
matrixStack.pop();
|
matrixStack.pop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@ public class GuiGreenhouseController extends GuiBase<BuiltScreenHandler> {
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
RenderSystem.pushMatrix();
|
RenderSystem.pushMatrix();
|
||||||
renderTooltip(matrixStack, list, mouseX - getGuiLeft(), mouseY - getGuiTop());
|
method_30901(matrixStack, list, mouseX - getGuiLeft(), mouseY - getGuiTop());
|
||||||
RenderSystem.popMatrix();
|
RenderSystem.popMatrix();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class GuiIronFurnace extends GuiBase<BuiltScreenHandler> {
|
||||||
|
|
||||||
List<Text> list = new ArrayList<>();
|
List<Text> list = new ArrayList<>();
|
||||||
list.add(new LiteralText(message));
|
list.add(new LiteralText(message));
|
||||||
renderTooltip(matrixStack, list, mouseX, mouseY);
|
method_30901(matrixStack, list, mouseX, mouseY);
|
||||||
GlStateManager.disableLighting();
|
GlStateManager.disableLighting();
|
||||||
GlStateManager.color4f(1, 1, 1, 1);
|
GlStateManager.color4f(1, 1, 1, 1);
|
||||||
|
|
||||||
|
|
|
@ -87,10 +87,10 @@ public class GuiManual extends Screen {
|
||||||
int centerX = (width / 2) - guiWidth / 2;
|
int centerX = (width / 2) - guiWidth / 2;
|
||||||
int centerY = (height / 2) - guiHeight / 2;
|
int centerY = (height / 2) - guiHeight / 2;
|
||||||
drawTexture(matrixStack, centerX, centerY, 0, 0, guiWidth, guiHeight);
|
drawTexture(matrixStack, centerX, centerY, 0, 0, guiWidth, guiHeight);
|
||||||
textRenderer.draw(matrixStack, text1, ((width / 2) - textRenderer.getWidth(text1) / 2), centerY + 40, 4210752);
|
textRenderer.method_30883(matrixStack, text1, ((width / 2) - textRenderer.getWidth(text1) / 2), centerY + 40, 4210752);
|
||||||
textRenderer.draw(matrixStack, text2, ((width / 2) - textRenderer.getWidth(text2) / 2), centerY + 90, 4210752);
|
textRenderer.method_30883(matrixStack, text2, ((width / 2) - textRenderer.getWidth(text2) / 2), centerY + 90, 4210752);
|
||||||
if (TechRebornConfig.allowManualRefund) {
|
if (TechRebornConfig.allowManualRefund) {
|
||||||
textRenderer.draw(matrixStack, text3, ((width / 2) - textRenderer.getWidth(text3) / 2), centerY + 140, 4210752);
|
textRenderer.method_30883(matrixStack, text3, ((width / 2) - textRenderer.getWidth(text3) / 2), centerY + 140, 4210752);
|
||||||
}
|
}
|
||||||
super.render(matrixStack, mouseX, mouseY, partialTicks);
|
super.render(matrixStack, mouseX, mouseY, partialTicks);
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,19 +66,19 @@ public class GuiStorageUnit extends GuiBase<BuiltScreenHandler> {
|
||||||
int storedAmount = storageEntity.storedAmount;
|
int storedAmount = storageEntity.storedAmount;
|
||||||
|
|
||||||
if (storedAmount == 0 && !storageEntity.isLocked()) {
|
if (storedAmount == 0 && !storageEntity.isLocked()) {
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752);
|
textRenderer.method_30883(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752);
|
||||||
} else {
|
} else {
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.storage.store"), 10, 20, 4210752);
|
textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.storage.store"), 10, 20, 4210752);
|
||||||
textRenderer.draw(matrixStack, storageEntity.getDisplayedStack().getName(), 10, 30, 4210752);
|
textRenderer.method_30883(matrixStack, storageEntity.getDisplayedStack().getName(), 10, 30, 4210752);
|
||||||
|
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.storage.amount"), 10, 50, 4210752);
|
textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.storage.amount"), 10, 50, 4210752);
|
||||||
textRenderer.draw(matrixStack, String.valueOf(storedAmount), 10, 60, 4210752);
|
textRenderer.draw(matrixStack, String.valueOf(storedAmount), 10, 60, 4210752);
|
||||||
|
|
||||||
String percentFilled = String.valueOf((int) ((double) storedAmount / (double) storageEntity.getMaxCapacity() * 100));
|
String percentFilled = String.valueOf((int) ((double) storedAmount / (double) storageEntity.getMaxCapacity() * 100));
|
||||||
|
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752);
|
textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752);
|
||||||
|
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680);
|
textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,20 +64,20 @@ public class GuiTankUnit extends GuiBase<BuiltScreenHandler> {
|
||||||
FluidInstance fluid = tankEntity.getTank().getFluidInstance();
|
FluidInstance fluid = tankEntity.getTank().getFluidInstance();
|
||||||
|
|
||||||
if (fluid.isEmpty()) {
|
if (fluid.isEmpty()) {
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752);
|
textRenderer.method_30883(matrixStack, new TranslatableText("techreborn.tooltip.unit.empty"), 10, 20, 4210752);
|
||||||
} else {
|
} else {
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.tank.type"), 10, 20, 4210752);
|
textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.tank.type"), 10, 20, 4210752);
|
||||||
textRenderer.draw(matrixStack, FluidUtil.getFluidName(fluid).replace("_", " "), 10, 30, 4210752);
|
textRenderer.draw(matrixStack, FluidUtil.getFluidName(fluid).replace("_", " "), 10, 30, 4210752);
|
||||||
|
|
||||||
|
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.tank.amount"), 10, 50, 4210752);
|
textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.tank.amount"), 10, 50, 4210752);
|
||||||
textRenderer.draw(matrixStack, fluid.getAmount().toString(), 10, 60, 4210752);
|
textRenderer.draw(matrixStack, fluid.getAmount().toString(), 10, 60, 4210752);
|
||||||
|
|
||||||
String percentFilled = String.valueOf((int) ((double) fluid.getAmount().getRawValue() / (double) tankEntity.getTank().getCapacity().getRawValue() * 100));
|
String percentFilled = String.valueOf((int) ((double) fluid.getAmount().getRawValue() / (double) tankEntity.getTank().getCapacity().getRawValue() * 100));
|
||||||
|
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752);
|
textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.unit.used").append(percentFilled + "%"), 10, 70, 4210752);
|
||||||
|
|
||||||
textRenderer.draw(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680);
|
textRenderer.method_30883(matrixStack, new TranslatableText("gui.techreborn.unit.wrenchtip"), 10, 80, 16711680);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ import net.minecraft.world.BlockRenderView;
|
||||||
import reborncore.common.fluid.container.ItemFluidInfo;
|
import reborncore.common.fluid.container.ItemFluidInfo;
|
||||||
import reborncore.common.util.Color;
|
import reborncore.common.util.Color;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
|
@ -36,7 +36,7 @@ import net.minecraft.util.math.MathHelper;
|
||||||
import techreborn.entities.EntityNukePrimed;
|
import techreborn.entities.EntityNukePrimed;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Mark on 13/03/2016.
|
* Created by Mark on 13/03/2016.
|
||||||
|
@ -69,7 +69,7 @@ public class NukeRenderer extends EntityRenderer<EntityNukePrimed> {
|
||||||
|
|
||||||
matrixStack.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90.0F));
|
matrixStack.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90.0F));
|
||||||
matrixStack.translate(-0.5D, -0.5D, 0.5D);
|
matrixStack.translate(-0.5D, -0.5D, 0.5D);
|
||||||
TntMinecartEntityRenderer.method_23190(TRContent.NUKE.getDefaultState(), matrixStack, vertexConsumerProvider, i, entity.getFuseTimer() / 5 % 2 == 0);
|
TntMinecartEntityRenderer.renderFlashingBlock(TRContent.NUKE.getDefaultState(), matrixStack, vertexConsumerProvider, i, entity.getFuseTimer() / 5 % 2 == 0);
|
||||||
matrixStack.pop();
|
matrixStack.pop();
|
||||||
super.render(entity, f, g, matrixStack, vertexConsumerProvider, i);
|
super.render(entity, f, g, matrixStack, vertexConsumerProvider, i);
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,9 +71,9 @@ public class TRRecipeParser {
|
||||||
return new FluidIngredient(fluid, Optional.empty(), amount);
|
return new FluidIngredient(fluid, Optional.empty(), amount);
|
||||||
} else if (in.indexOf('#') == 0) {
|
} else if (in.indexOf('#') == 0) {
|
||||||
Identifier id = new Identifier(in.substring(1));
|
Identifier id = new Identifier(in.substring(1));
|
||||||
Tag<Item> itemTag = ItemTags.getContainer().get(id);
|
Tag<Item> itemTag = ItemTags.getTagGroup().getTag(id);
|
||||||
if (itemTag == null) throw new CDSyntaxError("Failed to get item tag for input: " + in);
|
if (itemTag == null) throw new CDSyntaxError("Failed to get item tag for input: " + in);
|
||||||
return new TagIngredient(id, ItemTags.getContainer().get(id), amount);
|
return new TagIngredient(id, ItemTags.getTagGroup().getTag(id), amount);
|
||||||
} else {
|
} else {
|
||||||
ItemStack stack;
|
ItemStack stack;
|
||||||
Optional<CompoundTag> tag = Optional.empty();
|
Optional<CompoundTag> tag = Optional.empty();
|
||||||
|
|
|
@ -81,7 +81,7 @@ import techreborn.items.armor.QuantumSuitItem;
|
||||||
import techreborn.items.tool.MiningLevel;
|
import techreborn.items.tool.MiningLevel;
|
||||||
import techreborn.utils.InitUtils;
|
import techreborn.utils.InitUtils;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
|
@ -64,7 +64,7 @@ import techreborn.TechReborn;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.FluidUtils;
|
import techreborn.utils.FluidUtils;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by modmuss50 on 17/05/2016.
|
* Created by modmuss50 on 17/05/2016.
|
||||||
|
|
|
@ -45,7 +45,7 @@ import reborncore.common.util.ChatUtils;
|
||||||
import techreborn.TechReborn;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.MessageIDs;
|
import techreborn.utils.MessageIDs;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
|
|
@ -40,8 +40,8 @@ import reborncore.common.recipes.IUpgradeHandler;
|
||||||
import techreborn.TechReborn;
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class UpgradeItem extends Item implements IUpgrade {
|
public class UpgradeItem extends Item implements IUpgrade {
|
||||||
|
@ -57,10 +57,10 @@ public class UpgradeItem extends Item implements IUpgrade {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void process(
|
public void process(
|
||||||
@Nonnull MachineBaseBlockEntity blockEntity,
|
@NotNull MachineBaseBlockEntity blockEntity,
|
||||||
@Nullable
|
@Nullable
|
||||||
IUpgradeHandler handler,
|
IUpgradeHandler handler,
|
||||||
@Nonnull
|
@NotNull
|
||||||
ItemStack stack) {
|
ItemStack stack) {
|
||||||
behavior.process(blockEntity, handler, stack);
|
behavior.process(blockEntity, handler, stack);
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ import techreborn.TechReborn;
|
||||||
import techreborn.blockentity.cable.CableBlockEntity;
|
import techreborn.blockentity.cable.CableBlockEntity;
|
||||||
import techreborn.blocks.cable.CableBlock;
|
import techreborn.blocks.cable.CableBlock;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class PaintingToolItem extends Item {
|
public class PaintingToolItem extends Item {
|
||||||
|
|
|
@ -47,7 +47,7 @@ import techreborn.items.tool.MiningLevel;
|
||||||
import techreborn.utils.MessageIDs;
|
import techreborn.utils.MessageIDs;
|
||||||
import techreborn.utils.ToolsUtil;
|
import techreborn.utils.ToolsUtil;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
|
@ -50,7 +50,7 @@ import techreborn.utils.MessageIDs;
|
||||||
import techreborn.utils.TagUtils;
|
import techreborn.utils.TagUtils;
|
||||||
import techreborn.utils.ToolsUtil;
|
import techreborn.utils.ToolsUtil;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ import techreborn.utils.InitUtils;
|
||||||
import techreborn.utils.MessageIDs;
|
import techreborn.utils.MessageIDs;
|
||||||
import techreborn.utils.ToolsUtil;
|
import techreborn.utils.ToolsUtil;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class IndustrialDrillItem extends DrillItem {
|
public class IndustrialDrillItem extends DrillItem {
|
||||||
|
|
|
@ -53,7 +53,7 @@ import techreborn.items.tool.MiningLevel;
|
||||||
import techreborn.utils.MessageIDs;
|
import techreborn.utils.MessageIDs;
|
||||||
import techreborn.utils.ToolsUtil;
|
import techreborn.utils.ToolsUtil;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
|
@ -56,7 +56,7 @@ import techreborn.config.TechRebornConfig;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.MessageIDs;
|
import techreborn.utils.MessageIDs;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class NanosaberItem extends SwordItem implements EnergyHolder, ItemDurabilityExtensions, ItemStackModifiers {
|
public class NanosaberItem extends SwordItem implements EnergyHolder, ItemDurabilityExtensions, ItemStackModifiers {
|
||||||
|
|
|
@ -52,7 +52,7 @@ import techreborn.config.TechRebornConfig;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.InitUtils;
|
import techreborn.utils.InitUtils;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class OmniToolItem extends PickaxeItem implements EnergyHolder, ItemDurabilityExtensions {
|
public class OmniToolItem extends PickaxeItem implements EnergyHolder, ItemDurabilityExtensions {
|
||||||
|
|
|
@ -37,13 +37,13 @@ import reborncore.common.fluid.container.GenericFluidContainer;
|
||||||
import reborncore.common.fluid.container.ItemFluidInfo;
|
import reborncore.common.fluid.container.ItemFluidInfo;
|
||||||
import reborncore.mixin.common.AccessorFluidBlock;
|
import reborncore.mixin.common.AccessorFluidBlock;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class FluidUtils {
|
public class FluidUtils {
|
||||||
|
|
||||||
@Nonnull
|
@NotNull
|
||||||
public static Fluid fluidFromBlock(Block block) {
|
public static Fluid fluidFromBlock(Block block) {
|
||||||
if (block instanceof AccessorFluidBlock) {
|
if (block instanceof AccessorFluidBlock) {
|
||||||
return ((AccessorFluidBlock) block).getFluid();
|
return ((AccessorFluidBlock) block).getFluid();
|
||||||
|
@ -133,11 +133,11 @@ public class FluidUtils {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean fluidEquals(@Nonnull Fluid fluid, @Nonnull Fluid fluid1) {
|
public static boolean fluidEquals(@NotNull Fluid fluid, @NotNull Fluid fluid1) {
|
||||||
return fluid == fluid1;
|
return fluid == fluid1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static FluidInstance getFluidStackInContainer(@Nonnull ItemStack invStack) {
|
public static FluidInstance getFluidStackInContainer(@NotNull ItemStack invStack) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,12 +30,12 @@ import net.minecraft.recipe.RecipeType;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import techreborn.items.DynamicCellItem;
|
import techreborn.items.DynamicCellItem;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class RecipeUtils {
|
public class RecipeUtils {
|
||||||
@Nonnull
|
@NotNull
|
||||||
public static ItemStack getEmptyCell(int stackSize) {
|
public static ItemStack getEmptyCell(int stackSize) {
|
||||||
return DynamicCellItem.getEmptyCell(stackSize);
|
return DynamicCellItem.getEmptyCell(stackSize);
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,8 @@ import net.minecraft.block.Block;
|
||||||
import net.minecraft.fluid.Fluid;
|
import net.minecraft.fluid.Fluid;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.tag.Tag;
|
import net.minecraft.tag.Tag;
|
||||||
import net.minecraft.tag.TagContainer;
|
import net.minecraft.tag.TagGroup;
|
||||||
|
import net.minecraft.tag.TagGroupLoader;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public class TagUtils {
|
public class TagUtils {
|
||||||
|
@ -37,15 +38,15 @@ public class TagUtils {
|
||||||
return tag.contains(type);
|
return tag.contains(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static TagContainer<Block> getAllBlockTags(World world) {
|
public static TagGroup<Block> getAllBlockTags(World world) {
|
||||||
return world.getTagManager().blocks();
|
return world.getTagManager().getBlocks();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static TagContainer<Item> getAllItemTags(World world) {
|
public static TagGroup<Item> getAllItemTags(World world) {
|
||||||
return world.getTagManager().items();
|
return world.getTagManager().getItems();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static TagContainer<Fluid> getAllFluidTags(World world) {
|
public static TagGroup<Fluid> getAllFluidTags(World world) {
|
||||||
return world.getTagManager().fluids();
|
return world.getTagManager().getFluids();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ import net.minecraft.util.math.Direction;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import team.reborn.energy.Energy;
|
import team.reborn.energy.Energy;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
|
@ -28,7 +28,7 @@ import net.minecraft.block.sapling.SaplingGenerator;
|
||||||
import net.minecraft.world.gen.feature.ConfiguredFeature;
|
import net.minecraft.world.gen.feature.ConfiguredFeature;
|
||||||
import net.minecraft.world.gen.feature.TreeFeatureConfig;
|
import net.minecraft.world.gen.feature.TreeFeatureConfig;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
public class RubberSaplingGenerator extends SaplingGenerator {
|
public class RubberSaplingGenerator extends SaplingGenerator {
|
||||||
|
|
|
@ -7,6 +7,7 @@ import net.minecraft.world.WorldAccess;
|
||||||
import net.minecraft.world.gen.chunk.ChunkGenerator;
|
import net.minecraft.world.gen.chunk.ChunkGenerator;
|
||||||
import net.minecraft.world.gen.decorator.ChanceDecoratorConfig;
|
import net.minecraft.world.gen.decorator.ChanceDecoratorConfig;
|
||||||
import net.minecraft.world.gen.decorator.Decorator;
|
import net.minecraft.world.gen.decorator.Decorator;
|
||||||
|
import net.minecraft.world.gen.decorator.DecoratorContext;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.stream.IntStream;
|
import java.util.stream.IntStream;
|
||||||
|
@ -20,7 +21,7 @@ public class RubberTreeDecorator extends Decorator<ChanceDecoratorConfig> {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Stream<BlockPos> getPositions(WorldAccess world, ChunkGenerator generator, Random random, ChanceDecoratorConfig config, BlockPos pos) {
|
public Stream<BlockPos> getPositions(DecoratorContext context, Random random, ChanceDecoratorConfig config, BlockPos pos) {
|
||||||
// Generate tree clusters randomly
|
// Generate tree clusters randomly
|
||||||
if (random.nextInt(config.chance) == 0) {
|
if (random.nextInt(config.chance) == 0) {
|
||||||
// Generate 4 - 8 trees
|
// Generate 4 - 8 trees
|
||||||
|
@ -28,7 +29,7 @@ public class RubberTreeDecorator extends Decorator<ChanceDecoratorConfig> {
|
||||||
return IntStream.range(0, treeCount).mapToObj((i) -> {
|
return IntStream.range(0, treeCount).mapToObj((i) -> {
|
||||||
int x = random.nextInt(16) + pos.getX();
|
int x = random.nextInt(16) + pos.getX();
|
||||||
int z = random.nextInt(16) + pos.getZ();
|
int z = random.nextInt(16) + pos.getZ();
|
||||||
int y = world.getTopY(Heightmap.Type.MOTION_BLOCKING, x, z);
|
int y = context.getTopY(Heightmap.Type.MOTION_BLOCKING, x, z);
|
||||||
return new BlockPos(x, y, z);
|
return new BlockPos(x, y, z);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,7 @@ import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.util.math.BlockBox;
|
import net.minecraft.util.math.BlockBox;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.ModifiableTestableWorld;
|
import net.minecraft.world.ModifiableTestableWorld;
|
||||||
|
import net.minecraft.world.gen.UniformIntDistribution;
|
||||||
import net.minecraft.world.gen.feature.TreeFeature;
|
import net.minecraft.world.gen.feature.TreeFeature;
|
||||||
import net.minecraft.world.gen.feature.TreeFeatureConfig;
|
import net.minecraft.world.gen.feature.TreeFeatureConfig;
|
||||||
import net.minecraft.world.gen.foliage.BlobFoliagePlacer;
|
import net.minecraft.world.gen.foliage.BlobFoliagePlacer;
|
||||||
|
@ -49,8 +50,8 @@ public class RubberTreeFeature extends TreeFeature {
|
||||||
|
|
||||||
public static class FoliagePlacer extends BlobFoliagePlacer {
|
public static class FoliagePlacer extends BlobFoliagePlacer {
|
||||||
|
|
||||||
public FoliagePlacer(int radius, int randomRadius, int offset, int randomOffset, int height) {
|
public FoliagePlacer(UniformIntDistribution uniformIntDistribution, UniformIntDistribution uniformIntDistribution2, int height) {
|
||||||
super(radius, randomRadius, offset, randomOffset, height);
|
super(uniformIntDistribution, uniformIntDistribution2, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -24,27 +24,25 @@
|
||||||
|
|
||||||
package techreborn.world;
|
package techreborn.world;
|
||||||
|
|
||||||
import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
|
|
||||||
import net.minecraft.block.Blocks;
|
import net.minecraft.block.Blocks;
|
||||||
|
import net.minecraft.structure.rule.BlockStateMatchRuleTest;
|
||||||
|
import net.minecraft.structure.rule.RuleTest;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
import net.minecraft.world.biome.Biome;
|
import net.minecraft.world.biome.Biome;
|
||||||
import net.minecraft.world.biome.Biome.Category;
|
import net.minecraft.world.biome.Biome.Category;
|
||||||
import net.minecraft.world.gen.GenerationStep;
|
import net.minecraft.world.gen.GenerationStep;
|
||||||
|
import net.minecraft.world.gen.UniformIntDistribution;
|
||||||
import net.minecraft.world.gen.decorator.ChanceDecoratorConfig;
|
import net.minecraft.world.gen.decorator.ChanceDecoratorConfig;
|
||||||
import net.minecraft.world.gen.decorator.Decorator;
|
import net.minecraft.world.gen.feature.ConfiguredFeature;
|
||||||
import net.minecraft.world.gen.decorator.RangeDecoratorConfig;
|
|
||||||
import net.minecraft.world.gen.feature.Feature;
|
import net.minecraft.world.gen.feature.Feature;
|
||||||
import net.minecraft.world.gen.feature.OreFeatureConfig;
|
import net.minecraft.world.gen.feature.OreFeatureConfig;
|
||||||
import net.minecraft.world.gen.feature.OreFeatureConfig.Target;
|
|
||||||
import net.minecraft.world.gen.feature.TreeFeatureConfig;
|
import net.minecraft.world.gen.feature.TreeFeatureConfig;
|
||||||
import net.minecraft.world.gen.feature.size.TwoLayersFeatureSize;
|
import net.minecraft.world.gen.feature.size.TwoLayersFeatureSize;
|
||||||
import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider;
|
import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider;
|
||||||
import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
|
import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
|
||||||
import net.minecraft.world.gen.trunk.StraightTrunkPlacer;
|
import net.minecraft.world.gen.trunk.StraightTrunkPlacer;
|
||||||
import reborncore.common.world.CustomOreFeature;
|
|
||||||
import reborncore.common.world.CustomOreFeatureConfig;
|
|
||||||
import techreborn.blocks.misc.BlockRubberLog;
|
import techreborn.blocks.misc.BlockRubberLog;
|
||||||
import techreborn.config.TechRebornConfig;
|
import techreborn.config.TechRebornConfig;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent;
|
||||||
|
@ -52,6 +50,7 @@ import techreborn.init.TRContent;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author drcrazy
|
* @author drcrazy
|
||||||
|
@ -60,25 +59,25 @@ public class WorldGenerator {
|
||||||
|
|
||||||
public static Feature<TreeFeatureConfig> RUBBER_TREE_FEATURE;
|
public static Feature<TreeFeatureConfig> RUBBER_TREE_FEATURE;
|
||||||
public static RubberTreeDecorator RUBBER_TREE_DECORATOR;
|
public static RubberTreeDecorator RUBBER_TREE_DECORATOR;
|
||||||
|
|
||||||
public static TreeFeatureConfig RUBBER_TREE_CONFIG;
|
public static TreeFeatureConfig RUBBER_TREE_CONFIG;
|
||||||
|
private static final RuleTest END_STONE = new BlockStateMatchRuleTest(Blocks.END_STONE.getDefaultState());
|
||||||
|
|
||||||
private static final List<Biome> checkedBiomes = new ArrayList<>();
|
private static final List<Biome> checkedBiomes = new ArrayList<>();
|
||||||
|
|
||||||
public static void initBiomeFeatures() {
|
public static void initBiomeFeatures() {
|
||||||
setupTrees();
|
setupTrees();
|
||||||
|
//
|
||||||
for (Biome biome : Registry.BIOME) {
|
// for (Biome biome : Registry.BIOME) {
|
||||||
addToBiome(biome);
|
// addToBiome(biome);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
//Handles modded biomes
|
// //Handles modded biomes
|
||||||
RegistryEntryAddedCallback.event(Registry.BIOME).register((i, identifier, biome) -> addToBiome(biome));
|
// RegistryEntryAddedCallback.event(Registry.BIOME).register((i, identifier, biome) -> addToBiome(biome));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void setupTrees() {
|
private static void setupTrees() {
|
||||||
RUBBER_TREE_FEATURE = Registry.register(Registry.FEATURE, new Identifier("techreborn:rubber_tree"), new RubberTreeFeature(TreeFeatureConfig.CODEC));
|
RUBBER_TREE_FEATURE = Registry.register(Registry.FEATURE, new Identifier("techreborn:rubber_tree"), new RubberTreeFeature(TreeFeatureConfig.CODEC));
|
||||||
RUBBER_TREE_DECORATOR = Registry.register(Registry.DECORATOR, new Identifier("techreborn:rubber_tree"), new RubberTreeDecorator(ChanceDecoratorConfig.field_24980));
|
RUBBER_TREE_DECORATOR = Registry.register(Registry.DECORATOR, new Identifier("techreborn:rubber_tree"), new RubberTreeDecorator(ChanceDecoratorConfig.CODEC));
|
||||||
|
|
||||||
WeightedBlockStateProvider logProvider = new WeightedBlockStateProvider();
|
WeightedBlockStateProvider logProvider = new WeightedBlockStateProvider();
|
||||||
logProvider.addState(TRContent.RUBBER_LOG.getDefaultState(), 10);
|
logProvider.addState(TRContent.RUBBER_LOG.getDefaultState(), 10);
|
||||||
|
@ -94,7 +93,7 @@ public class WorldGenerator {
|
||||||
RUBBER_TREE_CONFIG = new TreeFeatureConfig.Builder(
|
RUBBER_TREE_CONFIG = new TreeFeatureConfig.Builder(
|
||||||
logProvider,
|
logProvider,
|
||||||
new SimpleBlockStateProvider(TRContent.RUBBER_LEAVES.getDefaultState()),
|
new SimpleBlockStateProvider(TRContent.RUBBER_LEAVES.getDefaultState()),
|
||||||
new RubberTreeFeature.FoliagePlacer(2, 0, 0, 0, 3),
|
new RubberTreeFeature.FoliagePlacer(UniformIntDistribution.of(2, 0), UniformIntDistribution.of(0, 0), 3),
|
||||||
new StraightTrunkPlacer(TechRebornConfig.rubberTreeBaseHeight, 3, 0),
|
new StraightTrunkPlacer(TechRebornConfig.rubberTreeBaseHeight, 3, 0),
|
||||||
new TwoLayersFeatureSize(1, 0, 1)
|
new TwoLayersFeatureSize(1, 0, 1)
|
||||||
).build();
|
).build();
|
||||||
|
@ -109,60 +108,60 @@ public class WorldGenerator {
|
||||||
|
|
||||||
if (biome.getCategory() == Category.NETHER) {
|
if (biome.getCategory() == Category.NETHER) {
|
||||||
if (TechRebornConfig.enableCinnabarOre) {
|
if (TechRebornConfig.enableCinnabarOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.CINNABAR);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_NETHER, TRContent.Ores.CINNABAR);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enablePyriteOre) {
|
if (TechRebornConfig.enablePyriteOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.PYRITE);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_NETHER, TRContent.Ores.PYRITE);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableSphaleriteOre) {
|
if (TechRebornConfig.enableSphaleriteOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NETHERRACK, TRContent.Ores.SPHALERITE);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_NETHER, TRContent.Ores.SPHALERITE);
|
||||||
}
|
}
|
||||||
} else if (biome.getCategory() == Category.THEEND) {
|
} else if (biome.getCategory() == Category.THEEND) {
|
||||||
if (TechRebornConfig.enablePeridotOre) {
|
if (TechRebornConfig.enablePeridotOre) {
|
||||||
addEndOre(biome, TRContent.Ores.PERIDOT);
|
addOre(biome, END_STONE, TRContent.Ores.PERIDOT);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableSheldoniteOre) {
|
if (TechRebornConfig.enableSheldoniteOre) {
|
||||||
addEndOre(biome, TRContent.Ores.SHELDONITE);
|
addOre(biome, END_STONE, TRContent.Ores.SHELDONITE);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableSodaliteOre) {
|
if (TechRebornConfig.enableSodaliteOre) {
|
||||||
addEndOre(biome, TRContent.Ores.SODALITE);
|
addOre(biome, END_STONE, TRContent.Ores.SODALITE);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableTungstenOre) {
|
if (TechRebornConfig.enableTungstenOre) {
|
||||||
addEndOre(biome, TRContent.Ores.TUNGSTEN);
|
addOre(biome, END_STONE, TRContent.Ores.TUNGSTEN);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (TechRebornConfig.enableBauxiteOre) {
|
if (TechRebornConfig.enableBauxiteOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.BAUXITE);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.BAUXITE);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableCopperOre) {
|
if (TechRebornConfig.enableCopperOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.COPPER);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.COPPER);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableGalenaOre) {
|
if (TechRebornConfig.enableGalenaOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.GALENA);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.GALENA);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableIridiumOre) {
|
if (TechRebornConfig.enableIridiumOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.IRIDIUM);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.IRIDIUM);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableLeadOre) {
|
if (TechRebornConfig.enableLeadOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.LEAD);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.LEAD);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableRubyOre) {
|
if (TechRebornConfig.enableRubyOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.RUBY);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.RUBY);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableSapphireOre) {
|
if (TechRebornConfig.enableSapphireOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.SAPPHIRE);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.SAPPHIRE);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableSilverOre) {
|
if (TechRebornConfig.enableSilverOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.SILVER);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.SILVER);
|
||||||
}
|
}
|
||||||
if (TechRebornConfig.enableTinOre) {
|
if (TechRebornConfig.enableTinOre) {
|
||||||
addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, TRContent.Ores.TIN);
|
addOre(biome, OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, TRContent.Ores.TIN);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (biome.getCategory() == Category.FOREST || biome.getCategory() == Category.TAIGA || biome.getCategory() == Category.SWAMP) {
|
if (biome.getCategory() == Category.FOREST || biome.getCategory() == Category.TAIGA || biome.getCategory() == Category.SWAMP) {
|
||||||
biome.addFeature(GenerationStep.Feature.VEGETAL_DECORATION,
|
addFeature(biome, GenerationStep.Feature.VEGETAL_DECORATION,
|
||||||
RUBBER_TREE_FEATURE.configure(RUBBER_TREE_CONFIG)
|
RUBBER_TREE_FEATURE.configure(RUBBER_TREE_CONFIG)
|
||||||
.createDecoratedFeature(RUBBER_TREE_DECORATOR
|
.decorate(RUBBER_TREE_DECORATOR
|
||||||
.configure(new ChanceDecoratorConfig(biome.getCategory() == Category.SWAMP ? TechRebornConfig.rubberTreeChance / 3 : TechRebornConfig.rubberTreeChance))
|
.configure(new ChanceDecoratorConfig(biome.getCategory() == Category.SWAMP ? TechRebornConfig.rubberTreeChance / 3 : TechRebornConfig.rubberTreeChance))
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
@ -170,15 +169,16 @@ public class WorldGenerator {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addOre(Biome biome, Target canReplaceIn, TRContent.Ores ore) {
|
private static void addOre(Biome biome, RuleTest ruleTest, TRContent.Ores ore) {
|
||||||
biome.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, Feature.ORE.configure(
|
addFeature(biome,
|
||||||
new OreFeatureConfig(canReplaceIn, ore.block.getDefaultState(), ore.veinSize)).createDecoratedFeature(Decorator.COUNT_RANGE.configure(
|
GenerationStep.Feature.UNDERGROUND_ORES,
|
||||||
new RangeDecoratorConfig(ore.veinsPerChunk, ore.minY, ore.minY, ore.maxY))));
|
Feature.ORE.configure(
|
||||||
|
new OreFeatureConfig(ruleTest, ore.block.getDefaultState(), ore.veinSize)
|
||||||
|
).method_30377(ore.veinsPerChunk)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addEndOre(Biome biome, TRContent.Ores ore) {
|
private static void addFeature(Biome biome, GenerationStep.Feature feature, ConfiguredFeature<?, ?> configuredFeature) {
|
||||||
biome.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, CustomOreFeature.CUSTOM_ORE_FEATURE.configure(
|
// Nope
|
||||||
new CustomOreFeatureConfig(blockState -> blockState.getBlock() == Blocks.END_STONE, ore.block.getDefaultState(), ore.veinSize)).createDecoratedFeature(Decorator.COUNT_RANGE.configure(
|
|
||||||
new RangeDecoratorConfig(ore.veinsPerChunk, ore.minY, ore.minY, ore.maxY))));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue