mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-01 09:32:54 +00:00
Code Issues Releases Wiki Activity

Bump Forge version

Browse Source
This commit is contained in:
SquidDev 2019-10-01 18:53:38 +01:00
parent b1139a4bf6
commit 4243f30308
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.google.code.gson:gson:2.8.1' classpath 'com.google.code.gson:gson:2.8.1'
classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.142' classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.147'
classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2' classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0' classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
} }

2
gradle.properties
View File

@ -3,5 +3,5 @@ mod_version=1.84.1
# Minecraft properties # Minecraft properties
mc_version=1.14.4 mc_version=1.14.4
forge_version=28.1.1 forge_version=28.1.26
mappings_version=20190912-1.14.3 mappings_version=20190912-1.14.3

11
src/main/java/dan200/computercraft/shared/turtle/FurnaceRefuelHandler.java
View File

@ -12,8 +12,7 @@ import dan200.computercraft.api.turtle.event.TurtleRefuelEvent;
import dan200.computercraft.shared.util.InventoryUtil; import dan200.computercraft.shared.util.InventoryUtil;
import dan200.computercraft.shared.util.WorldUtil; import dan200.computercraft.shared.util.WorldUtil;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.FurnaceTileEntity; import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
@ -52,15 +51,9 @@ public final class FurnaceRefuelHandler implements TurtleRefuelEvent.Handler
return fuelToGive; return fuelToGive;
} }
private static int getFuelPerItem( @Nonnull ItemStack stack ) private static int getFuelPerItem( @Nonnull ItemStack stack )
{ {
int basicBurnTime = stack.getBurnTime(); return (ForgeHooks.getBurnTime( stack ) * 5) / 100;
int burnTime = ForgeEventFactory.getItemBurnTime(
stack,
basicBurnTime == -1 ? FurnaceTileEntity.getBurnTimes().getOrDefault( stack.getItem(), 0 ) : basicBurnTime
);
return (burnTime * 5) / 100;
} }
@SubscribeEvent @SubscribeEvent