Split client and server.
This commit is contained in:
parent
3cb62b0291
commit
c3622cb263
208 changed files with 194 additions and 219 deletions
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.dashloader;
|
||||
package techreborn.client.compat.dashloader;
|
||||
|
||||
import net.oskarstrom.dashloader.DashRegistry;
|
||||
import net.oskarstrom.dashloader.api.annotation.DashConstructor;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.dashloader;
|
||||
package techreborn.client.compat.dashloader;
|
||||
|
||||
import net.oskarstrom.dashloader.DashRegistry;
|
||||
import net.oskarstrom.dashloader.api.annotation.DashConstructor;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei;
|
||||
package techreborn.client.compat.rei;
|
||||
|
||||
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
||||
import me.shedaniel.rei.api.common.display.Display;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei;
|
||||
package techreborn.client.compat.rei;
|
||||
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import dev.architectury.event.CompoundEventResult;
|
||||
|
@ -51,7 +51,6 @@ import me.shedaniel.rei.impl.client.gui.widget.EntryWidget;
|
|||
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandler;
|
||||
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.DrawableHelper;
|
||||
import net.minecraft.client.texture.Sprite;
|
||||
import net.minecraft.client.texture.SpriteAtlasTexture;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
|
@ -76,13 +75,13 @@ import techreborn.api.generator.EFluidGenerator;
|
|||
import techreborn.api.generator.GeneratorRecipeHelper;
|
||||
import techreborn.api.recipe.recipes.FluidReplicatorRecipe;
|
||||
import techreborn.api.recipe.recipes.RollingMachineRecipe;
|
||||
import techreborn.compat.rei.fluidgenerator.FluidGeneratorRecipeCategory;
|
||||
import techreborn.compat.rei.fluidgenerator.FluidGeneratorRecipeDisplay;
|
||||
import techreborn.compat.rei.fluidreplicator.FluidReplicatorRecipeCategory;
|
||||
import techreborn.compat.rei.fluidreplicator.FluidReplicatorRecipeDisplay;
|
||||
import techreborn.compat.rei.machine.*;
|
||||
import techreborn.compat.rei.rollingmachine.RollingMachineCategory;
|
||||
import techreborn.compat.rei.rollingmachine.RollingMachineDisplay;
|
||||
import techreborn.client.compat.rei.fluidgenerator.FluidGeneratorRecipeCategory;
|
||||
import techreborn.client.compat.rei.machine.*;
|
||||
import techreborn.client.compat.rei.fluidgenerator.FluidGeneratorRecipeDisplay;
|
||||
import techreborn.client.compat.rei.fluidreplicator.FluidReplicatorRecipeCategory;
|
||||
import techreborn.client.compat.rei.fluidreplicator.FluidReplicatorRecipeDisplay;
|
||||
import techreborn.client.compat.rei.rollingmachine.RollingMachineCategory;
|
||||
import techreborn.client.compat.rei.rollingmachine.RollingMachineDisplay;
|
||||
import techreborn.init.ModRecipes;
|
||||
import techreborn.init.TRContent;
|
||||
import techreborn.init.TRContent.Machine;
|
||||
|
@ -389,7 +388,7 @@ public class ReiPlugin implements REIClientPlugin {
|
|||
while (offsetHeight != 0) {
|
||||
final int curHeight = Math.min(offsetHeight, iconHeight);
|
||||
|
||||
DrawableHelper.drawSprite(matrixStack, x, y - offsetHeight, 0, width, curHeight, sprite);
|
||||
drawSprite(matrixStack, x, y - offsetHeight, 0, width, curHeight, sprite);
|
||||
offsetHeight -= curHeight;
|
||||
iteration++;
|
||||
if (iteration > 50) {
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.fluidgenerator;
|
||||
package techreborn.client.compat.rei.fluidgenerator;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -35,12 +35,11 @@ import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
|
|||
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
||||
import me.shedaniel.rei.api.common.util.EntryStacks;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.util.Identifier;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import techreborn.TechReborn;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
import techreborn.init.TRContent;
|
||||
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.fluidgenerator;
|
||||
package techreborn.client.compat.rei.fluidgenerator;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.fluidreplicator;
|
||||
package techreborn.client.compat.rei.fluidreplicator;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import me.shedaniel.math.Point;
|
||||
|
@ -37,13 +37,12 @@ import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
|||
import me.shedaniel.rei.api.common.util.EntryStacks;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.util.Identifier;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.api.recipe.recipes.FluidReplicatorRecipe;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.fluidreplicator;
|
||||
package techreborn.client.compat.rei.fluidreplicator;
|
||||
|
||||
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
||||
import me.shedaniel.rei.api.common.display.Display;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -31,13 +31,12 @@ import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
|
|||
import me.shedaniel.rei.api.client.gui.widgets.Widget;
|
||||
import me.shedaniel.rei.api.client.gui.widgets.Widgets;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.util.Identifier;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.rei.api.client.gui.DisplayRenderer;
|
||||
import me.shedaniel.rei.api.client.gui.Renderer;
|
||||
|
@ -33,11 +33,10 @@ import me.shedaniel.rei.api.common.entry.EntryIngredient;
|
|||
import me.shedaniel.rei.api.common.util.EntryStacks;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -32,8 +32,8 @@ import net.minecraft.text.Text;
|
|||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,20 +22,18 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
import me.shedaniel.rei.api.client.gui.widgets.Widget;
|
||||
import me.shedaniel.rei.api.client.gui.widgets.Widgets;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -32,8 +32,8 @@ import net.minecraft.text.Text;
|
|||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -32,8 +32,8 @@ import net.minecraft.text.Text;
|
|||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import me.shedaniel.math.Point;
|
||||
|
@ -32,14 +32,13 @@ import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
|
|||
import me.shedaniel.rei.api.client.gui.widgets.Widget;
|
||||
import me.shedaniel.rei.api.client.gui.widgets.Widgets;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.util.Identifier;
|
||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -32,8 +32,8 @@ import net.minecraft.text.Text;
|
|||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -32,8 +32,8 @@ import net.minecraft.text.Text;
|
|||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -32,8 +32,8 @@ import net.minecraft.text.Text;
|
|||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -32,8 +32,8 @@ import net.minecraft.text.Text;
|
|||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.machine;
|
||||
package techreborn.client.compat.rei.machine;
|
||||
|
||||
import me.shedaniel.math.Point;
|
||||
import me.shedaniel.math.Rectangle;
|
||||
|
@ -32,8 +32,8 @@ import net.minecraft.text.Text;
|
|||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.MachineRecipeDisplay;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.rollingmachine;
|
||||
package techreborn.client.compat.rei.rollingmachine;
|
||||
|
||||
import me.shedaniel.rei.api.client.gui.Renderer;
|
||||
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
||||
|
@ -31,10 +31,9 @@ import me.shedaniel.rei.plugin.client.categories.crafting.DefaultCraftingCategor
|
|||
import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import techreborn.api.recipe.recipes.RollingMachineRecipe;
|
||||
import techreborn.compat.rei.ReiPlugin;
|
||||
import techreborn.client.compat.rei.ReiPlugin;
|
||||
|
||||
public class RollingMachineCategory extends DefaultCraftingCategory {
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.compat.rei.rollingmachine;
|
||||
package techreborn.client.compat.rei.rollingmachine;
|
||||
|
||||
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
||||
import me.shedaniel.rei.plugin.common.displays.crafting.DefaultShapedDisplay;
|
|
@ -41,8 +41,6 @@ import net.minecraft.fluid.Fluids;
|
|||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.registry.Registry;
|
|
@ -28,7 +28,6 @@ import net.minecraft.client.gui.screen.Screen;
|
|||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.gui.builder.widget.GuiButtonUpDown;
|
||||
import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType;
|
||||
|
@ -89,6 +88,6 @@ public class GuiAESU extends GuiBase<BuiltScreenHandler> {
|
|||
}
|
||||
|
||||
public void onClick(int amount) {
|
||||
NetworkManager.sendToServer(ServerboundPackets.createPacketAesu(amount, Screen.hasShiftDown(), Screen.hasControlDown(), blockEntity));
|
||||
NetworkManager.sendToServer(ServerboundPackets.createPacketAesu(amount, hasShiftDown(), hasControlDown(), blockEntity));
|
||||
}
|
||||
}
|
|
@ -27,7 +27,6 @@ package techreborn.client.gui;
|
|||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
|
@ -28,7 +28,6 @@ import net.minecraft.client.gui.widget.ButtonWidget;
|
|||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.client.ClientChunkManager;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.gui.builder.widget.GuiButtonUpDown;
|
|
@ -29,7 +29,6 @@ import net.minecraft.client.resource.language.I18n;
|
|||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
|
@ -27,7 +27,6 @@ package techreborn.client.gui;
|
|||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
|
@ -29,8 +29,6 @@ import net.minecraft.client.gui.screen.ConfirmChatLinkScreen;
|
|||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.Util;
|
||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
|
@ -27,7 +27,6 @@ package techreborn.client.gui;
|
|||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.client.gui.builder.widget.GuiButtonUpDown;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
|
@ -27,7 +27,6 @@ package techreborn.client.gui;
|
|||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import reborncore.client.gui.builder.GuiBase;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import techreborn.blockentity.generator.SolarPanelBlockEntity;
|
|
@ -35,7 +35,6 @@ import net.minecraft.util.Identifier;
|
|||
import net.minecraft.util.math.random.AbstractRandom;
|
||||
import techreborn.TechReborn;
|
||||
|
||||
import java.util.Random;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class DynamicCellBakedModel extends BaseDynamicFluidBakedModel {
|
|
@ -28,7 +28,7 @@ import net.minecraft.entity.player.PlayerEntity;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.screen.ScreenHandler;
|
||||
import net.minecraft.screen.slot.Slot;
|
||||
import reborncore.client.gui.slots.SlotFilteredVoid;
|
||||
import reborncore.common.screen.slot.SlotFilteredVoid;
|
||||
import reborncore.common.util.RebornInventory;
|
||||
import techreborn.init.TRContent;
|
||||
|
|
@ -28,7 +28,7 @@ import net.minecraft.block.entity.AbstractFurnaceBlockEntity;
|
|||
import net.minecraft.inventory.Inventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import reborncore.client.gui.slots.BaseSlot;
|
||||
import reborncore.common.screen.slot.BaseSlot;
|
||||
|
||||
public class FurnaceFuelSlot extends BaseSlot {
|
||||
|
|
@ -41,11 +41,11 @@ import org.apache.commons.lang3.Validate;
|
|||
import org.apache.commons.lang3.text.WordUtils;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.client.screen.builder.BlockEntityScreenHandlerBuilder;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.crafting.RebornRecipeType;
|
||||
import reborncore.common.recipes.RecipeCrafter;
|
||||
import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.util.RebornInventory;
|
||||
import reborncore.common.util.serialization.SerializationUtil;
|
||||
import techreborn.blockentity.machine.GenericMachineBlockEntity;
|
||||
|
|
|
@ -28,7 +28,7 @@ import com.google.gson.JsonArray;
|
|||
import com.google.gson.JsonElement;
|
||||
import net.minecraft.util.JsonHelper;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import reborncore.client.screen.builder.BlockEntityScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder;
|
||||
import reborncore.common.util.serialization.SerializationUtil;
|
||||
|
||||
import java.util.List;
|
||||
|
|
|
@ -24,7 +24,8 @@
|
|||
|
||||
package techreborn.blockentity.data;
|
||||
|
||||
import reborncore.client.screen.builder.BlockEntityScreenHandlerBuilder;
|
||||
|
||||
import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.function.BiConsumer;
|
||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.fluid.FluidValue;
|
||||
import techreborn.api.generator.EFluidGenerator;
|
||||
import techreborn.config.TechRebornConfig;
|
||||
|
|
|
@ -31,8 +31,6 @@ import net.minecraft.entity.player.PlayerEntity;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NbtCompound;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Direction;
|
||||
|
@ -41,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
|
|||
import reborncore.api.IToolDrop;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.blockentity.MachineBaseBlockEntity;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
|
||||
|
|
|
@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.fluid.FluidValue;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import techreborn.api.generator.EFluidGenerator;
|
||||
import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity;
|
||||
import techreborn.config.TechRebornConfig;
|
||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.fluid.FluidValue;
|
||||
import techreborn.api.generator.EFluidGenerator;
|
||||
import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity;
|
||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.fluid.FluidValue;
|
||||
import techreborn.api.generator.EFluidGenerator;
|
||||
import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity;
|
||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.fluid.FluidValue;
|
||||
import techreborn.api.generator.EFluidGenerator;
|
||||
import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity;
|
||||
|
|
|
@ -41,7 +41,7 @@ import reborncore.api.IToolDrop;
|
|||
import reborncore.api.blockentity.InventoryProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.blockentity.MachineBaseBlockEntity;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
|
||||
|
|
|
@ -28,7 +28,7 @@ import net.minecraft.block.BlockState;
|
|||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.crafting.RebornRecipe;
|
||||
import reborncore.common.crafting.ingredient.RebornIngredient;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
|
|
|
@ -35,7 +35,7 @@ import net.minecraft.recipe.RecipeType;
|
|||
import net.minecraft.recipe.SmeltingRecipe;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.util.RebornInventory;
|
||||
|
|
|
@ -35,7 +35,7 @@ import reborncore.api.IToolDrop;
|
|||
import reborncore.api.blockentity.InventoryProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandlerProvider;
|
||||
import reborncore.common.screen.BuiltScreenHandler;
|
||||
import reborncore.client.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.screen.builder.ScreenHandlerBuilder;
|
||||
import reborncore.common.blockentity.MachineBaseBlockEntity;
|
||||
import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
|
||||
import reborncore.common.util.RebornInventory;
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue