1.14.2
This commit is contained in:
parent
4479116d1c
commit
f8f20ce6ba
81 changed files with 280 additions and 434 deletions
|
@ -80,7 +80,7 @@ public class ModRecipes {
|
|||
ScrapboxRecipes.init();
|
||||
ChemicalReactorRecipes.init();
|
||||
FusionReactorRecipes.init();
|
||||
EnvTypeillationTowerRecipes.init();
|
||||
DistillationTowerRecipes.init();
|
||||
AlloySmelterRecipes.init();
|
||||
FluidReplicatorRecipes.init();
|
||||
|
||||
|
|
|
@ -334,7 +334,7 @@ public class TRContent {
|
|||
AUTO_CRAFTING_TABLE(new BlockAutoCraftingTable()),
|
||||
CHEMICAL_REACTOR(new BlockChemicalReactor()),
|
||||
COMPRESSOR(new BlockCompressor()),
|
||||
EnvTypeILLATION_TOWER(new BlockDistillationTower()),
|
||||
DISTILLATION_TOWER(new BlockDistillationTower()),
|
||||
EXTRACTOR(new BlockExtractor()),
|
||||
FLUID_REPLICATOR(new BlockFluidReplicator()),
|
||||
GRINDER(new BlockGrinder()),
|
||||
|
@ -424,7 +424,7 @@ public class TRContent {
|
|||
|
||||
private Dusts() {
|
||||
name = this.toString().toLowerCase();
|
||||
item = new Item(new Item.Settings().itemGroup(TechReborn.ITEMGROUP));
|
||||
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
|
||||
InitUtils.setup(item, name + "_dust");
|
||||
}
|
||||
|
||||
|
@ -455,7 +455,7 @@ public class TRContent {
|
|||
|
||||
private SmallDusts() {
|
||||
name = this.toString().toLowerCase();
|
||||
item = new Item(new Item.Settings().itemGroup(TechReborn.ITEMGROUP));
|
||||
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
|
||||
InitUtils.setup(item, name + "_small_dust");
|
||||
}
|
||||
|
||||
|
@ -481,7 +481,7 @@ public class TRContent {
|
|||
|
||||
private Gems() {
|
||||
name = this.toString().toLowerCase();
|
||||
item = new Item(new Item.Settings().itemGroup(TechReborn.ITEMGROUP));
|
||||
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
|
||||
InitUtils.setup(item, name + "_gem");
|
||||
}
|
||||
|
||||
|
@ -508,7 +508,7 @@ public class TRContent {
|
|||
|
||||
private Ingots() {
|
||||
name = this.toString().toLowerCase();
|
||||
item = new Item(new Item.Settings().itemGroup(TechReborn.ITEMGROUP));
|
||||
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
|
||||
InitUtils.setup(item, name + "_ingot");
|
||||
}
|
||||
|
||||
|
@ -535,7 +535,7 @@ public class TRContent {
|
|||
|
||||
private Nuggets() {
|
||||
name = this.toString().toLowerCase();
|
||||
item = new Item(new Item.Settings().itemGroup(TechReborn.ITEMGROUP));
|
||||
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
|
||||
InitUtils.setup(item, name + "_nugget");
|
||||
}
|
||||
|
||||
|
@ -602,7 +602,7 @@ public class TRContent {
|
|||
|
||||
private Parts() {
|
||||
name = this.toString().toLowerCase();
|
||||
item = new Item(new Item.Settings().itemGroup(TechReborn.ITEMGROUP));
|
||||
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
|
||||
InitUtils.setup(item, name);
|
||||
}
|
||||
|
||||
|
@ -631,7 +631,7 @@ public class TRContent {
|
|||
|
||||
private Plates() {
|
||||
name = this.toString().toLowerCase();
|
||||
item = new Item(new Item.Settings().itemGroup(TechReborn.ITEMGROUP));
|
||||
item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP));
|
||||
InitUtils.setup(item, name + "_plate");
|
||||
}
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ public class TRTileEntities {
|
|||
public static final BlockEntityType<TileAdjustableSU> ADJUSTABLE_SU = register(TileAdjustableSU.class, "adjustable_su");
|
||||
public static final BlockEntityType<TileLapotronicSU> LAPOTRONIC_SU = register(TileLapotronicSU.class, "lapotronic_su");
|
||||
public static final BlockEntityType<TileLSUStorage> LSU_STORAGE = register(TileLSUStorage.class, "lsu_storage");
|
||||
public static final BlockEntityType<TileDistillationTower> EnvTypeILLATION_TOWER = register(TileDistillationTower.class, "distillation_tower");
|
||||
public static final BlockEntityType<TileDistillationTower> DISTILLATION_TOWER = register(TileDistillationTower.class, "distillation_tower");
|
||||
public static final BlockEntityType<TileVacuumFreezer> VACUUM_FREEZER = register(TileVacuumFreezer.class, "vacuum_freezer");
|
||||
public static final BlockEntityType<TileFusionControlComputer> FUSION_CONTROL_COMPUTER = register(TileFusionControlComputer.class, "fusion_control_computer");
|
||||
public static final BlockEntityType<TileLightningRod> LIGHTNING_ROD = register(TileLightningRod.class, "lightning_rod");
|
||||
|
|
|
@ -79,7 +79,7 @@ public enum TRToolTier implements ToolMaterial {
|
|||
}
|
||||
|
||||
@Override
|
||||
public float getBlockBreakingSpeed() {
|
||||
public float getMiningSpeed() {
|
||||
return efficiency;
|
||||
}
|
||||
|
||||
|
|
|
@ -61,18 +61,18 @@ public class DistillationTowerRecipes extends RecipeMethods {
|
|||
output3 = outputs[2];
|
||||
output4 = outputs[3];
|
||||
} else {
|
||||
throw new InvalidParameterException("Invalid number of EnvTypeillation tower outputs: " + outputs);
|
||||
throw new InvalidParameterException("Invalid number of Distillation tower outputs: " + outputs);
|
||||
}
|
||||
|
||||
int cellCount = 0;
|
||||
for (ItemStack stack : outputs) {
|
||||
if (stack.getItem() instanceof DynamicCell) {
|
||||
cellCount += stack.getAmount();
|
||||
cellCount += stack.getCount();
|
||||
}
|
||||
}
|
||||
|
||||
if (input.getItem() instanceof DynamicCell) {
|
||||
int inputCount = input.getAmount();
|
||||
int inputCount = input.getCount();
|
||||
if (cellCount < inputCount) {
|
||||
if (output2 == null) {
|
||||
output2 = DynamicCell.getEmptyCell(inputCount - cellCount);
|
||||
|
@ -90,11 +90,11 @@ public class DistillationTowerRecipes extends RecipeMethods {
|
|||
ItemStack cells = null;
|
||||
if (cellCount > 0) {
|
||||
if (cellCount > 64) {
|
||||
throw new InvalidParameterException("Invalid EnvTypeillation tower outputs: " + outputs + "(Recipe requires > 64 cells)");
|
||||
throw new InvalidParameterException("Invalid Distillation tower outputs: " + outputs + "(Recipe requires > 64 cells)");
|
||||
}
|
||||
cells = DynamicCell.getEmptyCell(cellCount);
|
||||
}
|
||||
// RecipeHandler.addRecipe(Reference.EnvTypeILLATION_TOWER_RECIPE, new EnvTypeillationTowerRecipe(input, cells, output1, output2, output3, output4, ticks, euPerTick, oreDict));
|
||||
// RecipeHandler.addRecipe(Reference.DistiLLATION_TOWER_RECIPE, new DistillationTowerRecipe(input, cells, output1, output2, output3, output4, ticks, euPerTick, oreDict));
|
||||
}
|
||||
|
||||
static void register(ItemStack input, int ticks, int euPerTick, ItemStack... outputs) {
|
||||
|
|
|
@ -139,14 +139,14 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods {
|
|||
int cellCount = 0;
|
||||
for (ItemStack stack : outputs) {
|
||||
if (stack.getItem() instanceof DynamicCell) {
|
||||
cellCount += stack.getAmount();
|
||||
cellCount += stack.getCount();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (input instanceof ItemStack) {
|
||||
if (((ItemStack) input).getItem() instanceof DynamicCell) {
|
||||
int inputCount = ((ItemStack) input).getAmount();
|
||||
int inputCount = ((ItemStack) input).getCount();
|
||||
if (cellCount < inputCount) {
|
||||
if (output2 == null) {
|
||||
output2 = DynamicCell.getEmptyCell(inputCount - cellCount);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue