Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts: # src/main/java/techreborn/events/ModRegistry.java
This commit is contained in:
commit
71d88ae44a
40 changed files with 666 additions and 68 deletions
|
@ -146,6 +146,8 @@ public class TRContent {
|
|||
public static Block RUBBER_PRESSURE_PLATE;
|
||||
public static Block RUBBER_DOOR;
|
||||
public static Block RUBBER_LOG_STRIPPED;
|
||||
public static Block RUBBER_WOOD;
|
||||
public static Block STRIPPED_RUBBER_WOOD;
|
||||
|
||||
// Armor
|
||||
public static Item CLOAKING_DEVICE;
|
||||
|
@ -408,22 +410,22 @@ public class TRContent {
|
|||
}
|
||||
|
||||
public enum Ores implements ItemConvertible {
|
||||
BAUXITE(6, 10, 10, 60),
|
||||
CINNABAR(6, 3, 10, 126),
|
||||
COPPER(8, 16, 20, 60),
|
||||
GALENA(8, 16, 10, 60),
|
||||
IRIDIUM(3, 3, 5, 60),
|
||||
LEAD(6, 16, 20, 60),
|
||||
PERIDOT(6, 3, 10, 250),
|
||||
PYRITE(6, 3, 10, 126),
|
||||
RUBY(6, 3, 10, 60),
|
||||
SAPPHIRE(6, 3, 10, 60),
|
||||
SHELDONITE(6, 3, 10, 250),
|
||||
SILVER(6, 16, 20, 60),
|
||||
SODALITE(6, 3, 10, 250),
|
||||
SPHALERITE(6, 3, 10, 126),
|
||||
TIN(8, 16, 20, 60),
|
||||
TUNGSTEN(6, 3, 10, 250);
|
||||
BAUXITE(TechRebornConfig.bauxiteVeinSize, TechRebornConfig.bauxiteVeinCount, 10, 60),
|
||||
CINNABAR(TechRebornConfig.cinnabarVeinSize, TechRebornConfig.cinnabarVeinCount, 10, 126),
|
||||
COPPER(TechRebornConfig.copperVeinSize, TechRebornConfig.copperVeinCount, 20, 60),
|
||||
GALENA(TechRebornConfig.galenaVeinSize, TechRebornConfig.galenaVeinCount, 10, 60),
|
||||
IRIDIUM(TechRebornConfig.iridiumVeinSize, TechRebornConfig.iridiumVeinCount, 5, 60),
|
||||
LEAD(TechRebornConfig.leadVeinSize, TechRebornConfig.leadVeinCount, 20, 60),
|
||||
PERIDOT(TechRebornConfig.peridotVeinSize, TechRebornConfig.peridotVeinCount, 10, 250),
|
||||
PYRITE(TechRebornConfig.pyriteVeinSize, TechRebornConfig.pyriteVeinCount, 10, 126),
|
||||
RUBY(TechRebornConfig.rubyVeinSize, TechRebornConfig.rubyVeinCount, 10, 60),
|
||||
SAPPHIRE(TechRebornConfig.sapphireVeinSize, TechRebornConfig.sapphireVeinCount, 10, 60),
|
||||
SHELDONITE(TechRebornConfig.sheldoniteVeinSize, TechRebornConfig.sheldoniteVeinCount, 10, 250),
|
||||
SILVER(TechRebornConfig.silverVeinSize, TechRebornConfig.silverVeinCount, 20, 60),
|
||||
SODALITE(TechRebornConfig.sodaliteVeinSize, TechRebornConfig.sodaliteVeinCount, 10, 250),
|
||||
SPHALERITE(TechRebornConfig.sphaleriteVeinSize, TechRebornConfig.sphaleriteVeinCount, 10, 126),
|
||||
TIN(TechRebornConfig.tinVeinSize, TechRebornConfig.tinVeinCount, 20, 60),
|
||||
TUNGSTEN(TechRebornConfig.tungstenVeinSize, TechRebornConfig.tungstenVeinCount, 10, 250);
|
||||
|
||||
public final String name;
|
||||
public final Block block;
|
||||
|
|
|
@ -1,3 +1,27 @@
|
|||
/*
|
||||
* This file is part of TechReborn, licensed under the MIT License (MIT).
|
||||
*
|
||||
* Copyright (c) 2020 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.init;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
@ -85,10 +109,8 @@ public class TRDispenserBehavior {
|
|||
this.dispense(pointer, emptyCell);
|
||||
}
|
||||
}
|
||||
return stack;
|
||||
} else {
|
||||
return this.dispense(pointer, stack);
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue