From 2904a532486f4f467e17a6a77778eeed3470811b Mon Sep 17 00:00:00 2001 From: st161153 Date: Mon, 21 Dec 2020 18:14:59 +0100 Subject: [PATCH 1/6] Change Capacity --- .../enderstorage/storage/liquid/EnderLiquidStorage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codechicken/enderstorage/storage/liquid/EnderLiquidStorage.java b/src/codechicken/enderstorage/storage/liquid/EnderLiquidStorage.java index 7f2e021..a171fe3 100644 --- a/src/codechicken/enderstorage/storage/liquid/EnderLiquidStorage.java +++ b/src/codechicken/enderstorage/storage/liquid/EnderLiquidStorage.java @@ -13,7 +13,7 @@ public class EnderLiquidStorage extends AbstractEnderStorage implements IFluidHandler { - public static final int CAPACITY = 16 * FluidUtils.B; + public static final int CAPACITY = 4096 * FluidUtils.B; private class Tank extends ExtendedFluidTank { From b89db6f63acd32a562b7eeb634b9eeaa6deab2c0 Mon Sep 17 00:00:00 2001 From: alphaNOVAir Date: Mon, 21 Dec 2020 21:39:48 +0100 Subject: [PATCH 2/6] Change Capacity in Tank Render to adjust fluid hight to stay in block limit --- .../enderstorage/storage/liquid/EnderTankRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codechicken/enderstorage/storage/liquid/EnderTankRenderer.java b/src/codechicken/enderstorage/storage/liquid/EnderTankRenderer.java index 62805a4..722a921 100644 --- a/src/codechicken/enderstorage/storage/liquid/EnderTankRenderer.java +++ b/src/codechicken/enderstorage/storage/liquid/EnderTankRenderer.java @@ -131,6 +131,6 @@ public static void renderLiquid(FluidStack liquid, double x, double y, double z) RenderUtils.renderFluidCuboid(liquid, new Cuboid6(0.22, 0.12, 0.22, 0.78, 0.121+0.63, 0.78) .add(new Vector3(x, y, z)), - liquid.amount/(16D*FluidUtils.B), 0.75); + liquid.amount/(4096D*FluidUtils.B), 0.75); } } \ No newline at end of file From 2dfdb954e08e0ded901bbaccc2da0d7819131afa Mon Sep 17 00:00:00 2001 From: alphaNOVAir Date: Tue, 22 Dec 2020 20:52:30 +0100 Subject: [PATCH 3/6] Reduce Capacity to 256 Buckets (fast enough to run steel or other 1 tick recipes in mbf to supply gas with it) --- .idea/.gitignore | 8 +++++ .idea/artifacts/enderStorageTest.xml | 6 ++++ .idea/compiler.xml | 6 ++++ .idea/gradle.xml | 17 +++++++++ .idea/jarRepositories.xml | 35 +++++++++++++++++++ .idea/misc.xml | 8 +++++ .idea/vcs.xml | 6 ++++ .../storage/liquid/EnderLiquidStorage.java | 2 +- .../storage/liquid/EnderTankRenderer.java | 2 +- 9 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/artifacts/enderStorageTest.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..d613dd8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/../../../../../../:\Users\marcg\IdeaProjects\EnderStorage\.idea/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/artifacts/enderStorageTest.xml b/.idea/artifacts/enderStorageTest.xml new file mode 100644 index 0000000..10dda3d --- /dev/null +++ b/.idea/artifacts/enderStorageTest.xml @@ -0,0 +1,6 @@ + + + $PROJECT_DIR$/out/artifacts/enderStorageTest + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..443b5d2 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..611e7c8 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..6e7c91c --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e3577fe --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/codechicken/enderstorage/storage/liquid/EnderLiquidStorage.java b/src/codechicken/enderstorage/storage/liquid/EnderLiquidStorage.java index a171fe3..6c80588 100644 --- a/src/codechicken/enderstorage/storage/liquid/EnderLiquidStorage.java +++ b/src/codechicken/enderstorage/storage/liquid/EnderLiquidStorage.java @@ -13,7 +13,7 @@ public class EnderLiquidStorage extends AbstractEnderStorage implements IFluidHandler { - public static final int CAPACITY = 4096 * FluidUtils.B; + public static final int CAPACITY = 256 * FluidUtils.B; private class Tank extends ExtendedFluidTank { diff --git a/src/codechicken/enderstorage/storage/liquid/EnderTankRenderer.java b/src/codechicken/enderstorage/storage/liquid/EnderTankRenderer.java index 722a921..0ee6dcf 100644 --- a/src/codechicken/enderstorage/storage/liquid/EnderTankRenderer.java +++ b/src/codechicken/enderstorage/storage/liquid/EnderTankRenderer.java @@ -131,6 +131,6 @@ public static void renderLiquid(FluidStack liquid, double x, double y, double z) RenderUtils.renderFluidCuboid(liquid, new Cuboid6(0.22, 0.12, 0.22, 0.78, 0.121+0.63, 0.78) .add(new Vector3(x, y, z)), - liquid.amount/(4096D*FluidUtils.B), 0.75); + liquid.amount/(256D*FluidUtils.B), 0.75); } } \ No newline at end of file From 6a46059fd7175c63b608e6514f3f20924d4593a1 Mon Sep 17 00:00:00 2001 From: alphaNOVAir Date: Tue, 22 Dec 2020 20:57:24 +0100 Subject: [PATCH 4/6] Remove .idea folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 014b8a5..f9d9d30 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ Ender-Storage.iws build.iml build.ipr build.iws +/.idea/ From 8cb4eb3a23832388fda1f6dabf3557c12d3785fb Mon Sep 17 00:00:00 2001 From: alphaNOVAir Date: Tue, 22 Dec 2020 21:00:36 +0100 Subject: [PATCH 5/6] Remove .idea folder --- .gitignore | 2 +- .idea/.gitignore | 8 ------- .idea/artifacts/enderStorageTest.xml | 6 ----- .idea/compiler.xml | 6 ----- .idea/gradle.xml | 17 -------------- .idea/jarRepositories.xml | 35 ---------------------------- .idea/misc.xml | 8 ------- .idea/vcs.xml | 6 ----- 8 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/artifacts/enderStorageTest.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index f9d9d30..13aad1d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ Ender-Storage.iws build.iml build.ipr build.iws -/.idea/ + diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index d613dd8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/../../../../../../:\Users\marcg\IdeaProjects\EnderStorage\.idea/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/artifacts/enderStorageTest.xml b/.idea/artifacts/enderStorageTest.xml deleted file mode 100644 index 10dda3d..0000000 --- a/.idea/artifacts/enderStorageTest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/enderStorageTest - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 443b5d2..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 611e7c8..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 6e7c91c..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e3577fe..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 67029410e314dcf5c5e94d12077fe8ee0ecd4b6c Mon Sep 17 00:00:00 2001 From: alphaNOVAir Date: Tue, 22 Dec 2020 21:03:14 +0100 Subject: [PATCH 6/6] Add .idea to gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 13aad1d..f9d9d30 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ Ender-Storage.iws build.iml build.ipr build.iws - +/.idea/