Auto format code.
This commit is contained in:
parent
a96c094267
commit
72f85d5243
33 changed files with 15 additions and 66 deletions
|
@ -1,7 +1,5 @@
|
|||
package techreborn.blocks;
|
||||
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.properties.PropertyInteger;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
|
@ -10,11 +8,7 @@ import net.minecraft.creativetab.CreativeTabs;
|
|||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
@ -24,7 +18,7 @@ import techreborn.tiles.TileMachineCasing;
|
|||
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockMachineCasing extends BlockMultiblockBase {
|
||||
public class BlockMachineCasing extends BlockMultiblockBase {
|
||||
|
||||
public static final String[] types = new String[] { "standard", "reinforced", "advanced" };
|
||||
public static final PropertyInteger METADATA = PropertyInteger.create("type", 0, types.length);
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package techreborn.blocks;
|
||||
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.properties.PropertyInteger;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
|
@ -8,7 +7,6 @@ import net.minecraft.block.state.IBlockState;
|
|||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package techreborn.blocks.generator;
|
||||
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.properties.PropertyBool;
|
||||
|
@ -18,7 +17,7 @@ import techreborn.tiles.generator.TileSolarPanel;
|
|||
/**
|
||||
* Created by modmuss50 on 25/02/2016.
|
||||
*/
|
||||
public class BlockSolarPanel extends BaseTileBlock {
|
||||
public class BlockSolarPanel extends BaseTileBlock {
|
||||
|
||||
public static PropertyBool ACTIVE = PropertyBool.create("active");
|
||||
private final String prefix = "techreborn:blocks/machine/generators/";
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
package techreborn.blocks.generator;
|
||||
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.RebornCore;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
package techreborn.blocks.generator;
|
||||
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.RebornCore;
|
||||
import reborncore.common.BaseTileBlock;
|
||||
|
|
|
@ -76,14 +76,14 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecip
|
|||
return inputs;
|
||||
}
|
||||
|
||||
public List<FluidStack> getFluidInputs(){
|
||||
public List<FluidStack> getFluidInputs() {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
public List<ItemStack> getOutputs() {
|
||||
List<ItemStack> stacks = new ArrayList<>();
|
||||
for(List<ItemStack> stackList : outputs){
|
||||
for (List<ItemStack> stackList : outputs) {
|
||||
stacks.addAll(stackList);
|
||||
}
|
||||
return stacks;
|
||||
|
|
|
@ -101,13 +101,13 @@ public class RecipeUtil {
|
|||
}
|
||||
|
||||
//TODO 1.11
|
||||
// if (fluidOutputSlots != null) {
|
||||
// List<FluidStack> fluidOutputs = recipe.getFluidOutputs();
|
||||
// for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) {
|
||||
// int outputTank = fluidOutputSlots[i];
|
||||
// guiFluidStacks.set(outputTank, fluidOutputs.get(i));
|
||||
// }
|
||||
// }
|
||||
// if (fluidOutputSlots != null) {
|
||||
// List<FluidStack> fluidOutputs = recipe.getFluidOutputs();
|
||||
// for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) {
|
||||
// int outputTank = fluidOutputSlots[i];
|
||||
// guiFluidStacks.set(outputTank, fluidOutputs.get(i));
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
public static void setRecipeItems(
|
||||
|
|
|
@ -248,7 +248,6 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
|||
.addRecipeTransferHandler(ContainerExtractor.class, RecipeCategoryUids.EXTRACTOR, 0, 1, 2, 36);
|
||||
recipeTransferRegistry
|
||||
.addRecipeTransferHandler(ContainerCompressor.class, RecipeCategoryUids.COMPRESSOR, 0, 1, 2, 36);
|
||||
|
||||
|
||||
if (CompatManager.isQuantumStorageLoaded) {
|
||||
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.quantumChest));
|
||||
|
|
|
@ -53,7 +53,6 @@ public class AssemblingMachineRecipeCategory extends BlankRecipeCategory<Assembl
|
|||
electricity.draw(minecraft, 10, 20);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -43,7 +43,6 @@ public class BlastFurnaceRecipeCategory extends BlankRecipeCategory<BlastFurnace
|
|||
return background;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -24,7 +24,6 @@ public class CentrifugeRecipeHandler implements IRecipeHandler<CentrifugeRecipe>
|
|||
return CentrifugeRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -43,7 +43,6 @@ public class ChemicalReactorRecipeCategory extends BlankRecipeCategory<ChemicalR
|
|||
return background;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -24,7 +24,6 @@ public class ChemicalReactorRecipeHandler implements IRecipeHandler<ChemicalReac
|
|||
return ChemicalReactorRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -43,8 +43,6 @@ public class CompressorRecipeCategory extends BlankRecipeCategory<CompressorReci
|
|||
return background;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -24,7 +24,6 @@ public class CompressorRecipeHandler implements IRecipeHandler<CompressorRecipe>
|
|||
return CompressorRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -43,8 +43,6 @@ public class ExtractorRecipeCategory extends BlankRecipeCategory<ExtractorRecipe
|
|||
return background;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -24,7 +24,6 @@ public class ExtractorRecipeHandler implements IRecipeHandler<ExtractorRecipe> {
|
|||
return ExtractorRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -47,7 +47,6 @@ public class FusionReactorRecipeCategory extends BlankRecipeCategory<FusionReact
|
|||
return background;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -15,7 +15,6 @@ public class FusionReactorRecipeHandler implements IRecipeHandler<FusionReactorR
|
|||
return FusionReactorRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -9,8 +9,6 @@ import techreborn.compat.jei.RecipeUtil;
|
|||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class FusionReactorRecipeWrapper extends BlankRecipeWrapper {
|
||||
private final FusionReactorRecipe baseRecipe;
|
||||
|
@ -27,7 +25,6 @@ public class FusionReactorRecipeWrapper extends BlankRecipeWrapper {
|
|||
ingredients.setInput(ItemStack.class, baseRecipe.getOutput());
|
||||
}
|
||||
|
||||
|
||||
public ItemStack getTopInput() {
|
||||
return baseRecipe.getTopInput();
|
||||
}
|
||||
|
|
|
@ -43,7 +43,6 @@ public class GrinderRecipeCategory extends BlankRecipeCategory<GrinderRecipeWrap
|
|||
return background;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -24,7 +24,6 @@ public class GrinderRecipeHandler implements IRecipeHandler<GrinderRecipe> {
|
|||
return GrinderRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -24,7 +24,6 @@ public class ImplosionCompressorRecipeHandler implements IRecipeHandler<Implosio
|
|||
return ImplosionCompressorRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -43,7 +43,6 @@ public class IndustrialElectrolyzerRecipeCategory extends BlankRecipeCategory<In
|
|||
return background;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -24,7 +24,6 @@ public class IndustrialElectrolyzerRecipeHandler implements IRecipeHandler<Indus
|
|||
return IndustrialElectrolyzerRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -59,7 +59,6 @@ public class IndustrialGrinderRecipeCategory extends BlankRecipeCategory<Industr
|
|||
blankArea.draw(minecraft, 129, 49);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setRecipe(
|
||||
@Nonnull
|
||||
|
|
|
@ -24,7 +24,6 @@ public class IndustrialGrinderRecipeHandler implements IRecipeHandler<Industrial
|
|||
return IndustrialGrinderRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -9,7 +9,6 @@ import mezz.jei.plugins.vanilla.crafting.ShapedOreRecipeWrapper;
|
|||
import mezz.jei.plugins.vanilla.crafting.ShapedRecipesWrapper;
|
||||
import mezz.jei.plugins.vanilla.crafting.ShapelessOreRecipeWrapper;
|
||||
import mezz.jei.plugins.vanilla.crafting.ShapelessRecipesWrapper;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.ShapedRecipes;
|
||||
import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
|
@ -18,7 +17,6 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
|
|||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper {
|
||||
private final ICraftingRecipeWrapper baseRecipe;
|
||||
|
|
|
@ -24,7 +24,6 @@ public class ScrapboxRecipeHandler implements IRecipeHandler<ScrapboxRecipe> {
|
|||
return ScrapboxRecipe.class;
|
||||
}
|
||||
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid(
|
||||
|
|
|
@ -184,13 +184,12 @@ public class ModBlocks {
|
|||
machineCasing = new BlockMachineCasing(Material.ROCK);
|
||||
registerBlock(machineCasing, ItemBlockMachineCasing.class, "machinecasing");
|
||||
GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR");
|
||||
if(Core.proxy.isCTMAvailable()){
|
||||
if (Core.proxy.isCTMAvailable()) {
|
||||
Core.proxy.registerCustomBlockStateLocation(machineCasing, "machines/structure/machine_casing_ctm");
|
||||
} else {
|
||||
Core.proxy.registerCustomBlockStateLocation(machineCasing, "machines/structure/machine_casing");
|
||||
}
|
||||
|
||||
|
||||
ore = new BlockOre(Material.ROCK);
|
||||
registerBlock(ore, ItemBlockOre.class, "techreborn.ore");
|
||||
for (int i = 0; i < BlockOre.ores.length; i++) {
|
||||
|
@ -224,7 +223,6 @@ public class ModBlocks {
|
|||
registerBlock(magicEnergeyConverter, "magicenergyconverter");
|
||||
Core.proxy.registerCustomBlockStateLocation(magicEnergeyConverter, "machines/generators/magic_energy_converter");
|
||||
|
||||
|
||||
assemblyMachine = new BlockAssemblingMachine(Material.ROCK);
|
||||
registerBlock(assemblyMachine, "assemblymachine");
|
||||
GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR");
|
||||
|
@ -235,13 +233,11 @@ public class ModBlocks {
|
|||
GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(dieselGenerator, "machines/generators/diesel_generator");
|
||||
|
||||
|
||||
industrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.ROCK);
|
||||
registerBlock(industrialElectrolyzer, "industrialelectrolyzer");
|
||||
GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(industrialElectrolyzer, "machines/tier1_machines/industrial_electrolyzer");
|
||||
|
||||
|
||||
magicalAbsorber = new BlockMagicEnergyAbsorber(Material.ROCK);
|
||||
registerBlock(magicalAbsorber, "magicrnergyabsorber");
|
||||
Core.proxy.registerCustomBlockStateLocation(magicalAbsorber, "machines/generators/magic_energy_absorber");
|
||||
|
@ -301,7 +297,6 @@ public class ModBlocks {
|
|||
GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR");
|
||||
Core.proxy.registerCustomBlockStateLocation(fusionControlComputer, "machines/generators/fusion_reactor");
|
||||
|
||||
|
||||
fusionCoil = new BlockFusionCoil(Material.ROCK);
|
||||
registerBlock(fusionCoil, "fusioncoil");
|
||||
Core.proxy.registerCustomBlockStateLocation(fusionCoil, "machines/generators/fusion_coil");
|
||||
|
|
|
@ -2001,7 +2001,6 @@ public class ModRecipes {
|
|||
'S', ItemParts.getPartByName("diamondSawBlade"), 'C',
|
||||
"machineBlockAdvanced");
|
||||
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.chargeBench), "ETE", "COC", "EAD", 'E',
|
||||
"circuitMaster", 'T', ModItems.energyCrystal, 'C', Blocks.CHEST, 'O',
|
||||
ModItems.lapotronicOrb, 'A', "machineBlockAdvanced");
|
||||
|
@ -2061,9 +2060,9 @@ public class ModRecipes {
|
|||
// 'L', "lapotronCrystal",
|
||||
// 'T', TechRebornAPI.recipeCompact.getItem("teleporter"));
|
||||
|
||||
// CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.dragonEggEnergySiphoner), "CTC", "ISI", "CBC", 'I',
|
||||
// "plateIridium", 'C', "circuitBasic",
|
||||
// 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.extractor);
|
||||
// CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.dragonEggEnergySiphoner), "CTC", "ISI", "CBC", 'I',
|
||||
// "plateIridium", 'C', "circuitBasic",
|
||||
// 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.extractor);
|
||||
|
||||
CraftingHelper
|
||||
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "SCS", "BEB", "SCS", 'S', "plateSteel", 'C',
|
||||
|
@ -2154,7 +2153,6 @@ public class ModRecipes {
|
|||
ModBlocks.compressor);
|
||||
}
|
||||
|
||||
|
||||
// Smetling
|
||||
CraftingHelper
|
||||
.addSmelting(ItemDusts.getDustByName("copper", 1), getOre("ingotCopper"),
|
||||
|
|
|
@ -178,7 +178,6 @@ public class ClientProxy extends CommonProxy {
|
|||
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), 0, new ModelResourceLocation(resourceDomain + ':' + resourceLocation, "inventory"));
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void registerCustomBlockStateLocation(Block block, String resourceLocation, boolean item) {
|
||||
resourceLocation = resourceLocation.toLowerCase();
|
||||
|
|
|
@ -40,7 +40,6 @@ public class CommonProxy implements ICompatModule {
|
|||
|
||||
}
|
||||
|
||||
|
||||
public void registerCustomBlockStateLocation(Block block, String name) {
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue