dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump to 1.5.29, update Forge, update dependencies, change minimum Forge version

Browse Source
This commit is contained in:
raoulvdberge
2017-12-17 15:14:00 +01:00
parent b1600d0033
commit 373adb6d87
9 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,5 +1,8 @@
# Refined Storage Changelog
### 1.5.29
- Update Forge to 2577 (minimum Forge version required is now 2555 for MC 1.12.2)
### 1.5.28
- Fixed Writers not pushing energy (raoulvdberge)
- Item Reader/Writers can now store 16 stacks (raoulvdberge)

16
build.gradle
View File

@@ -20,7 +20,7 @@ apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'net.minecraftforge.gradle.forge'
version = "1.5.28"
version = "1.5.29"
group = "refinedstorage"
archivesBaseName = "refinedstorage"
@@ -28,10 +28,10 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
minecraft {
version = "1.12.2-14.23.0.2493"
version = "1.12.2-14.23.1.2577"
runDir = "run"
useDepAts = true
mappings = "snapshot_20170926"
mappings = "snapshot_20171217"
}
repositories {
@@ -54,12 +54,12 @@ repositories {
}
dependencies {
deobfCompile "mezz.jei:jei_1.12.2:4.7.11.101:api"
runtime "mezz.jei:jei_1.12.2:4.7.11.101"
deobfCompile "MCMultiPart2:MCMultiPart:2.2.2"
deobfCompile "li.cil.oc:OpenComputers:MC1.12.1-1.7.0.4:api"
deobfCompile "mezz.jei:jei_1.12.2:4.8.5.136:api"
runtime "mezz.jei:jei_1.12.2:4.8.5.136"
deobfCompile "MCMultiPart2:MCMultiPart:2.4.0"
deobfCompile "li.cil.oc:OpenComputers:MC1.12.1-1.7.1.43:api"
deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.1-5.3.3:api"
compile "inventory-tweaks:InventoryTweaks:1.63+beta.107:api"
compile "inventory-tweaks:InventoryTweaks:1.63:api"
}
processResources {

1
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,4 +1,3 @@
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

6
src/main/java/com/raoulvdberge/refinedstorage/RS.java
View File

@@ -16,15 +16,15 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
@Mod(modid = RS.ID, version = RS.VERSION, dependencies = RS.DEPENDENCIES, acceptedMinecraftVersions = "[1.12,1.13)", guiFactory = RS.GUI_FACTORY, updateJSON = RS.UPDATE_JSON, certificateFingerprint = RS.FINGERPRINT)
@Mod(modid = RS.ID, version = RS.VERSION, dependencies = RS.DEPENDENCIES, acceptedMinecraftVersions = "[1.12.2,1.13)", guiFactory = RS.GUI_FACTORY, updateJSON = RS.UPDATE_JSON, certificateFingerprint = RS.FINGERPRINT)
public final class RS {
static {
FluidRegistry.enableUniversalBucket();
}
public static final String ID = "refinedstorage";
public static final String VERSION = "1.5.28";
public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2363,);after:mcmultipart@[2.2.1,);after:storagedrawers@[1.12-5.2.2,);";
public static final String VERSION = "1.5.29";
public static final String DEPENDENCIES = "required-after:forge@[14.23.1.2555,);after:mcmultipart@[2.4.0,);after:storagedrawers@[1.12-5.2.2,);";
public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update";
public static final String FINGERPRINT = "57893d5b90a7336e8c63fe1c1e1ce472c3d59578";

3
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeLoader.java
View File

@@ -25,7 +25,6 @@ public class SoldererRecipeLoader {
public static void load() {
JsonContext context = new JsonContext(RS.ID);
// @todo: Move to non-deprecated method in MC 1.13.
CraftingHelper.findFiles(Loader.instance().activeModContainer(), "assets/" + RS.ID + "/solderer_recipes", root -> {
// @todo: Load the constants into to the context.
@@ -59,6 +58,6 @@ public class SoldererRecipeLoader {
}
return true;
});
}, false, false);
}
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorageMonitor.java
View File

@@ -5,7 +5,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeStorageMo
import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
@@ -48,7 +47,7 @@ public class BlockStorageMonitor extends BlockNode {
super.onBlockClicked(world, pos, player);
if (!world.isRemote) {
RayTraceResult rayResult = ForgeHooks.rayTraceEyes(player, ((EntityPlayerMP) player).interactionManager.getBlockReachDistance() + 1);
RayTraceResult rayResult = ForgeHooks.rayTraceEyes(player, player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).getAttributeValue() + 1);
if (rayResult == null) {
return;

1
src/main/java/com/raoulvdberge/refinedstorage/tile/config/IFilterable.java
View File

@@ -24,6 +24,7 @@ public interface IFilterable {
});
}
// @todo: Change in 1.13 to be by default blacklist, and accept all on blacklist and none on whitelist when no filter is set
static boolean canTake(IItemHandler filters, int mode, int compare, ItemStack stack) {
if (mode == WHITELIST) {
int slots = 0;

2
src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java
View File

@@ -79,7 +79,7 @@ public final class RenderUtils {
}
public static Vec3d getEnd(EntityPlayer player) {
double reachDistance = player instanceof EntityPlayerMP ? ((EntityPlayerMP) player).interactionManager.getBlockReachDistance() : (player.capabilities.isCreativeMode ? 5.0D : 4.5D);
double reachDistance = player instanceof EntityPlayerMP ? player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).getAttributeValue() : (player.capabilities.isCreativeMode ? 5.0D : 4.5D);
Vec3d lookVec = player.getLookVec();
Vec3d start = getStart(player);

2
src/main/resources/mcmod.info
View File

@@ -3,7 +3,7 @@
"modid": "refinedstorage",
"name": "Refined Storage",
"description": "An elegant solution to your hoarding problem",
"version": "1.5.28",
"version": "1.5.29",
"mcversion": "1.12.2",
"url": "https://refinedstorage.raoulvdberge.com",
"updateUrl": "",