tags for rolling machine + some REI polishing

This commit is contained in:
drcrazy 2019-08-20 00:01:38 +03:00
parent f682142ef7
commit 5bac19e302
9 changed files with 9 additions and 16 deletions

View file

@ -31,7 +31,6 @@ import reborncore.client.containerBuilder.builder.ContainerBuilder;
import reborncore.common.recipes.RecipeCrafter;
import reborncore.common.util.RebornInventory;
import techreborn.blockentity.GenericMachineBlockEntity;
import techreborn.config.TechRebornConfig;
import techreborn.init.ModRecipes;
import techreborn.init.TRBlockEntities;
import techreborn.init.TRContent;

View file

@ -27,7 +27,6 @@ package techreborn.blocks.transformers;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.world.BlockView;
import techreborn.blockentity.transformers.EVTransformerBlockEntity;
import techreborn.blockentity.transformers.HVTransformerBlockEntity;
/**
* Created by modmuss50 on 16/03/2016.

View file

@ -26,7 +26,6 @@ package techreborn.client.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;

View file

@ -28,7 +28,6 @@ import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.guibuilder.GuiBuilder;
import techreborn.blockentity.machine.tier1.AlloySmelterBlockEntity;
import techreborn.blockentity.machine.tier1.SoildCanningMachineBlockEntity;
public class GuiSolidCanningMachine extends GuiBase<BuiltContainer> {

View file

@ -28,7 +28,6 @@ import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.gui.builder.GuiBase;
import reborncore.client.gui.guibuilder.GuiBuilder;
import techreborn.blockentity.machine.tier1.AssemblingMachineBlockEntity;
import techreborn.blockentity.machine.tier1.WireMillBlockEntity;
public class GuiWireMill extends GuiBase<BuiltContainer> {

View file

@ -24,7 +24,6 @@
package techreborn.compat.rei;
import com.mojang.blaze3d.platform.GlStateManager;
import me.shedaniel.math.api.Point;
import me.shedaniel.math.api.Rectangle;
import me.shedaniel.rei.api.RecipeCategory;
@ -32,15 +31,11 @@ import me.shedaniel.rei.api.Renderer;
import me.shedaniel.rei.gui.renderers.RecipeRenderer;
import me.shedaniel.rei.gui.widget.*;
import me.shedaniel.rei.impl.ScreenHelper;
import me.shedaniel.rei.plugin.DefaultPlugin;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.GuiLighting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.RebornRecipeType;
import reborncore.common.util.StringUtils;
@ -92,6 +87,7 @@ public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCate
Point startPoint = new Point( bounds.getCenterX() - 41, bounds.getCenterY() - recipeLines*12 -1);
List<Widget> widgets = new LinkedList<>();
widgets.add(new RecipeBaseWidget(bounds));
widgets.add(new RecipeArrowWidget(startPoint.x + 24, startPoint.y + 1, true));
int i = 0;
@ -117,15 +113,15 @@ public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCate
@Override
public int getDisplayHeight() {
if (recipeLines == 1) {
return 36;
return 37;
}
else if (recipeLines == 3) {
return 90;
return 80;
}
else if (recipeLines == 4) {
return 110;
return 105;
}
return 66;
return 60;
}
}

View file

@ -659,6 +659,8 @@
"techreborn:scrapbox": "Scrapbox",
"techreborn:vacuum_freezer": "Vacuum Freezer",
"techreborn:fluid_replicator": "Fluid Replicator",
"techreborn:fusion_reactor": "Fusion Reactor",
"techreborn:rolling_machine": "Rolling Machine",
"_comment26": "Fluid buckets",
"item.techreborn.beryllium_bucket": "Beryllium",

View file

@ -11,7 +11,7 @@
"item": "techreborn:nickel_ingot"
},
"C": {
"item": "techreborn:copper_ingot"
"tag": "c:copper_ingot"
}
},
"result": {

View file

@ -8,7 +8,7 @@
],
"key": {
"A": {
"item": "techreborn:aluminum_ingot"
"tag": "c:aluminum_ingot"
},
"M": {
"item": "techreborn:magnesium_dust"