maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/1.13-prep' into 1.13-prep

Browse source
This commit is contained in:
modmuss50 2018-07-24 14:18:22 +01:00
commit 1f65363396
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
6 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/techreborn/blocks/BlockRubberLeaves.java
View file

@ -133,7 +133,7 @@ public class BlockRubberLeaves extends BlockLeaves {
@Override
public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
if(!fancyLeaves()){
blockState.shouldSideBeRendered(blockAccess, pos, side);
return blockState.shouldSideBeRendered(blockAccess, pos, side);
}
return true;
}

4
src/main/java/techreborn/config/ConfigTechReborn.java
View file

@ -37,7 +37,7 @@ public class ConfigTechReborn {
public static boolean enableGemArmorAndTools = true;
@ConfigRegistry(config = "items", category = "power", key = "nanoSaberCharge", comment = "Energy Capacity for Nano Saber (FE)")
public static int nanoSaberCharge = 640_000;
public static int nanoSaberCharge = 4_000_000;
@ConfigRegistry(config = "items", category = "power", key = "steelDrillCharge", comment = "Energy Capacity for Steel Drill (FE)")
public static int SteelDrillCharge = 40_000;
@ -67,7 +67,7 @@ public class ConfigTechReborn {
public static int AdvancedJackhammerCharge = 4_000_000;
@ConfigRegistry(config = "items", category = "power", key = "omniToolCharge", comment = "Energy Capacity for Omni Tool (FE)")
public static int OmniToolCharge = 20_000;
public static int OmniToolCharge = 4_000_000;
@ConfigRegistry(config = "items", category = "power", key = "rockCutterCharge", comment = "Energy Capacity for Rock Cutter (FE)")
public static int RockCutterCharge = 400_000;

3
src/main/java/techreborn/items/tools/ItemCloakingDevice.java
View file

@ -60,9 +60,10 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
public static int usage = 10;
public static int maxCharge = ConfigTechReborn.CloakingDeviceCharge;
public static int transferLimit = 100;
public static int transferLimit = 10_000;
public static boolean isActive;
// 40M FE capacity with 10k FE\t charge rate
public ItemCloakingDevice() {
super(Reference.CLOAKING_ARMOR, EntityEquipmentSlot.CHEST);
setTranslationKey("techreborn.cloakingdevice");

4
src/main/java/techreborn/items/tools/ItemNanosaber.java
View file

@ -63,8 +63,10 @@ import java.util.List;
public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
public static final int maxCharge = ConfigTechReborn.nanoSaberCharge;
public int transferLimit = 1_000;
public int cost = 250;
// 4M FE max charge with 1k charge rate
public ItemNanosaber() {
super(ToolMaterial.DIAMOND);
setNoRepair();
@ -237,7 +239,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
@Override
public int getMaxInput() {
return 1_000;
return transferLimit;
}
@Override

4
src/main/java/techreborn/items/tools/ItemOmniTool.java
View file

@ -57,9 +57,11 @@ import java.util.List;
public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
public static final int maxCharge = ConfigTechReborn.OmniToolCharge;
public int transferLimit = 1_000;
public int cost = 100;
public int hitCost = 125;
// 4M FE max charge with 1k charge rate
public ItemOmniTool() {
super(ToolMaterial.DIAMOND);
efficiency = 13F;
@ -177,7 +179,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
@Override
public int getMaxInput() {
return 1_000;
return transferLimit;
}
@Override

4
src/main/java/techreborn/items/tools/ItemRockCutter.java
View file

@ -55,8 +55,10 @@ import java.util.Random;
public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
public static final int maxCharge = ConfigTechReborn.RockCutterCharge;
public int transferLimit = 1_000;
public int cost = 500;
// 400k FE with 1k FE\t charge rate
public ItemRockCutter() {
super(ToolMaterial.DIAMOND);
setTranslationKey("techreborn.rockcutter");
@ -163,7 +165,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
@Override
public int getMaxInput() {
return 1_000;
return transferLimit;
}
@Override