Merge remote-tracking branch 'origin/1.14' into 1.14
This commit is contained in:
commit
711c95c58e
16 changed files with 30 additions and 90 deletions
|
@ -117,7 +117,6 @@ public class TechReborn implements ModInitializer {
|
||||||
|
|
||||||
proxy.postInit();
|
proxy.postInit();
|
||||||
|
|
||||||
ModRecipes.postInit();
|
|
||||||
|
|
||||||
CommandRegistry.INSTANCE.register(false, dispatcher -> dispatcher.register(CommandManager.literal("recipe").executes(context -> {
|
CommandRegistry.INSTANCE.register(false, dispatcher -> dispatcher.register(CommandManager.literal("recipe").executes(context -> {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -66,7 +66,7 @@ public class GuiAlloyFurnace extends AbstractContainerScreen<BuiltContainer> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void drawForeground(final int p_146979_1_, final int p_146979_2_) {
|
protected void drawForeground(final int p_146979_1_, final int p_146979_2_) {
|
||||||
final String name = I18n.translate("blockEntity.techreborn.iron_alloy_furnace.name");
|
final String name = I18n.translate("block.techreborn.iron_alloy_furnace");
|
||||||
this.font.draw(name, this.containerWidth / 2 - this.font.getStringWidth(name) / 2, 6,
|
this.font.draw(name, this.containerWidth / 2 - this.font.getStringWidth(name) / 2, 6,
|
||||||
4210752);
|
4210752);
|
||||||
this.font.draw(I18n.translate("container.inventory", new Object[0]), 8,
|
this.font.draw(I18n.translate("container.inventory", new Object[0]), 8,
|
||||||
|
|
|
@ -29,7 +29,6 @@ import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import reborncore.ClientProxy;
|
|
||||||
import reborncore.RebornCoreClient;
|
import reborncore.RebornCoreClient;
|
||||||
import reborncore.client.gui.builder.GuiBase;
|
import reborncore.client.gui.builder.GuiBase;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
||||||
|
|
|
@ -31,10 +31,11 @@ import net.minecraft.client.resource.language.I18n;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.text.LiteralText;
|
import net.minecraft.text.LiteralText;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
|
import reborncore.client.containerBuilder.builder.BuiltContainer;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonSimple;
|
import reborncore.client.gui.builder.widget.GuiButtonSimple;
|
||||||
import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity;
|
import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity;
|
||||||
|
|
||||||
public class GuiChunkLoader extends AbstractContainerScreen {
|
public class GuiChunkLoader extends AbstractContainerScreen<BuiltContainer> {
|
||||||
|
|
||||||
private static final Identifier texture = new Identifier("techreborn",
|
private static final Identifier texture = new Identifier("techreborn",
|
||||||
"textures/gui/industrial_chunkloader.png");
|
"textures/gui/industrial_chunkloader.png");
|
||||||
|
@ -80,7 +81,7 @@ public class GuiChunkLoader extends AbstractContainerScreen {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void drawForeground(final int p_146979_1_, final int p_146979_2_) {
|
protected void drawForeground(final int p_146979_1_, final int p_146979_2_) {
|
||||||
final String name = I18n.translate("blockEntity.techreborn:chunk_loader.name");
|
final String name = I18n.translate("block.techreborn.chunk_loader");
|
||||||
this.font.draw(name, this.containerWidth / 2 - this.font.getStringWidth(name) / 2, 6,
|
this.font.draw(name, this.containerWidth / 2 - this.font.getStringWidth(name) / 2, 6,
|
||||||
4210752);
|
4210752);
|
||||||
this.font.draw(I18n.translate("container.inventory", new Object[0]), 8,
|
this.font.draw(I18n.translate("container.inventory", new Object[0]), 8,
|
||||||
|
|
|
@ -29,7 +29,6 @@ import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import reborncore.ClientProxy;
|
|
||||||
import reborncore.RebornCoreClient;
|
import reborncore.RebornCoreClient;
|
||||||
import reborncore.client.gui.builder.GuiBase;
|
import reborncore.client.gui.builder.GuiBase;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
||||||
|
|
|
@ -28,7 +28,6 @@ import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import reborncore.ClientProxy;
|
|
||||||
import reborncore.RebornCoreClient;
|
import reborncore.RebornCoreClient;
|
||||||
import reborncore.client.gui.builder.GuiBase;
|
import reborncore.client.gui.builder.GuiBase;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
||||||
|
|
|
@ -29,7 +29,6 @@ import net.minecraft.client.gui.widget.ButtonWidget;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import org.apache.commons.lang3.tuple.Pair;
|
import org.apache.commons.lang3.tuple.Pair;
|
||||||
import reborncore.ClientProxy;
|
|
||||||
import reborncore.RebornCoreClient;
|
import reborncore.RebornCoreClient;
|
||||||
import reborncore.client.gui.builder.GuiBase;
|
import reborncore.client.gui.builder.GuiBase;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
||||||
|
|
|
@ -28,7 +28,6 @@ import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import reborncore.ClientProxy;
|
|
||||||
import reborncore.RebornCoreClient;
|
import reborncore.RebornCoreClient;
|
||||||
import reborncore.client.gui.builder.GuiBase;
|
import reborncore.client.gui.builder.GuiBase;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
||||||
|
|
|
@ -29,7 +29,6 @@ import net.minecraft.block.Blocks;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import reborncore.ClientProxy;
|
|
||||||
import reborncore.RebornCoreClient;
|
import reborncore.RebornCoreClient;
|
||||||
import reborncore.client.gui.builder.GuiBase;
|
import reborncore.client.gui.builder.GuiBase;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
||||||
|
|
|
@ -29,7 +29,6 @@ import net.minecraft.block.Blocks;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import reborncore.ClientProxy;
|
|
||||||
import reborncore.RebornCoreClient;
|
import reborncore.RebornCoreClient;
|
||||||
import reborncore.client.gui.builder.GuiBase;
|
import reborncore.client.gui.builder.GuiBase;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
||||||
|
|
|
@ -72,7 +72,7 @@ public class GuiIronFurnace extends GuiBase {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void drawForeground(int mouseX, int mouseY) {
|
protected void drawForeground(int mouseX, int mouseY) {
|
||||||
final String name = I18n.translate("blockEntity.techreborn.iron_furnace.name");
|
final String name = I18n.translate("block.techreborn.iron_furnace");
|
||||||
font.draw(name, containerWidth / 2 - font.getStringWidth(name) / 2, 6, 4210752);
|
font.draw(name, containerWidth / 2 - font.getStringWidth(name) / 2, 6, 4210752);
|
||||||
font.draw(I18n.translate("container.inventory", new Object[0]), 8, containerHeight - 96 + 2, 4210752);
|
font.draw(I18n.translate("container.inventory", new Object[0]), 8, containerHeight - 96 + 2, 4210752);
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.client.gui;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import reborncore.ClientProxy;
|
|
||||||
import reborncore.RebornCoreClient;
|
import reborncore.RebornCoreClient;
|
||||||
import reborncore.client.gui.builder.GuiBase;
|
import reborncore.client.gui.builder.GuiBase;
|
||||||
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
import reborncore.client.gui.builder.widget.GuiButtonExtended;
|
||||||
|
|
|
@ -24,15 +24,11 @@
|
||||||
|
|
||||||
package techreborn.init;
|
package techreborn.init;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import reborncore.common.crafting.RebornRecipe;
|
import reborncore.common.crafting.RebornRecipe;
|
||||||
import reborncore.common.crafting.RebornRecipeType;
|
import reborncore.common.crafting.RebornRecipeType;
|
||||||
import reborncore.common.crafting.RecipeManager;
|
import reborncore.common.crafting.RecipeManager;
|
||||||
import reborncore.common.registration.RebornRegister;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import net.minecraft.fluid.Fluid;
|
|
||||||
import io.github.prospector.silk.fluid.FluidInstance;
|
|
||||||
import reborncore.common.fluid.FluidUtil;
|
|
||||||
import techreborn.TechReborn;
|
import techreborn.TechReborn;
|
||||||
import techreborn.api.recipe.recipes.BlastFurnaceRecipe;
|
import techreborn.api.recipe.recipes.BlastFurnaceRecipe;
|
||||||
import techreborn.api.recipe.recipes.IndustrialGrinderRecipe;
|
import techreborn.api.recipe.recipes.IndustrialGrinderRecipe;
|
||||||
|
@ -66,30 +62,22 @@ public class ModRecipes {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
ExtractorRecipes.init();
|
|
||||||
RollingMachineRecipes.init();
|
RollingMachineRecipes.init();
|
||||||
FluidGeneratorRecipes.init();
|
FluidGeneratorRecipes.init();
|
||||||
IndustrialGrinderRecipes.init();
|
IndustrialGrinderRecipes.init();
|
||||||
IndustrialCentrifugeRecipes.init();
|
|
||||||
IndustrialElectrolyzerRecipes.init();
|
IndustrialElectrolyzerRecipes.init();
|
||||||
ImplosionCompressorRecipes.init();
|
ImplosionCompressorRecipes.init();
|
||||||
ScrapboxRecipes.init();
|
ScrapboxRecipes.init();
|
||||||
ChemicalReactorRecipes.init();
|
|
||||||
FusionReactorRecipes.init();
|
FusionReactorRecipes.init();
|
||||||
DistillationTowerRecipes.init();
|
|
||||||
|
|
||||||
FluidReplicatorRecipes.init();
|
FluidReplicatorRecipes.init();
|
||||||
|
|
||||||
addVacuumFreezerRecipes();
|
|
||||||
addGrinderRecipes();
|
|
||||||
addCompressorRecipes();
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void postInit() {
|
|
||||||
//IndustrialSawmillRecipes.init();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,28 +42,28 @@ public class ImplosionCompressorRecipes extends RecipeMethods {
|
||||||
// register(getOre("dustPeridot", 4), getMaterial("peridot", 3, Type.GEM), 12);
|
// register(getOre("dustPeridot", 4), getMaterial("peridot", 3, Type.GEM), 12);
|
||||||
// register(getOre("dustRedGarnet", 4), getMaterial("red_garnet", 3, Type.GEM), 8);
|
// register(getOre("dustRedGarnet", 4), getMaterial("red_garnet", 3, Type.GEM), 8);
|
||||||
// register(getOre("dustYellowGarnet", 4), getMaterial("yellow_garnet", 3, Type.GEM), 8);
|
// register(getOre("dustYellowGarnet", 4), getMaterial("yellow_garnet", 3, Type.GEM), 8);
|
||||||
if (oresExist("dustApatite", "gemApatite")) {
|
// if (oresExist("dustApatite", "gemApatite")) {
|
||||||
register(getOre("dustApatite", 4), getOre("gemApatite", 3), 12);
|
// register(getOre("dustApatite", 4), getOre("gemApatite", 3), 12);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
if (oresExist("dustCertusQuartz", "crystalCertusQuartz")) {
|
// if (oresExist("dustCertusQuartz", "crystalCertusQuartz")) {
|
||||||
register(getOre("dustCertusQuartz", 4), getOre("crystalCertusQuartz", 3), 12);
|
// register(getOre("dustCertusQuartz", 4), getOre("crystalCertusQuartz", 3), 12);
|
||||||
}
|
// }
|
||||||
if (oresExist("dustAmethyst", "gemAmethyst")) {
|
// if (oresExist("dustAmethyst", "gemAmethyst")) {
|
||||||
register(getOre("dustAmethyst", 4), getOre("gemAmethyst", 3), 12);
|
// register(getOre("dustAmethyst", 4), getOre("gemAmethyst", 3), 12);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
if (oresExist("dustTopaz", "gemTopaz")) {
|
// if (oresExist("dustTopaz", "gemTopaz")) {
|
||||||
register(getOre("dustTopaz", 4), getOre("gemTopaz", 3), 12);
|
// register(getOre("dustTopaz", 4), getOre("gemTopaz", 3), 12);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
if (oresExist("dustTanzanite", "gemTanzanite")) {
|
// if (oresExist("dustTanzanite", "gemTanzanite")) {
|
||||||
register(getOre("dustTanzanite", 4), getOre("gemTanzanite", 3), 12);
|
// register(getOre("dustTanzanite", 4), getOre("gemTanzanite", 3), 12);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
if (oresExist("dustMalachite", "gemMalachite")) {
|
// if (oresExist("dustMalachite", "gemMalachite")) {
|
||||||
register(getOre("dustMalachite", 4), getOre("gemMalachite", 3), 12);
|
// register(getOre("dustMalachite", 4), getOre("gemMalachite", 3), 12);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// register(getOre("blockRedstone", 9), getOre("dustRedGarnet", 4), 4);
|
// register(getOre("blockRedstone", 9), getOre("dustRedGarnet", 4), 4);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of TechReborn, licensed under the MIT License (MIT).
|
|
||||||
*
|
|
||||||
* Copyright (c) 2018 TechReborn
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
|
||||||
* copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package techreborn.itemblocks;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.item.BlockItem;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import techreborn.TechReborn;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by modmuss50 on 20/02/2016.
|
|
||||||
*/
|
|
||||||
public class ItemBlockRubberSapling extends BlockItem {
|
|
||||||
|
|
||||||
public ItemBlockRubberSapling(Block block) {
|
|
||||||
super(block, new Item.Settings().group(TechReborn.ITEMGROUP));
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -27,7 +27,7 @@
|
||||||
"name": "techreborn:sphalerite_ore"
|
"name": "techreborn:sphalerite_ore"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "minecraft:group",
|
"type": "minecraft:sequence",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"type": "minecraft:item",
|
"type": "minecraft:item",
|
||||||
|
|
Loading…
Add table
Reference in a new issue