From 05b4e80a9d45b199321b80d957cbea7bf07ee52f Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 25 Feb 2021 13:03:45 +0300 Subject: [PATCH] Mossy glowshroom texture update --- .../entities/EndStoneSmelterBlockEntity.java | 17 +++++++++++------ .../rei/REIAlloyingFuelCategory.java | 12 +++++++----- .../rei/REIAlloyingFuelDisplay.java | 12 ++++++------ .../betterend/integration/rei/REIPlugin.java | 3 --- .../textures/block/mossy_glowshroom_fur.png | Bin 453 -> 235 bytes .../block/mossy_glowshroom_hymenophore_1.png | Bin 659 -> 209 bytes .../block/mossy_glowshroom_hymenophore_2.png | Bin 661 -> 209 bytes .../block/mossy_glowshroom_hymenophore_3.png | Bin 661 -> 207 bytes .../block/mossy_glowshroom_hymenophore_4.png | Bin 659 -> 211 bytes 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java index cae5f872..67280b59 100644 --- a/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java @@ -1,11 +1,15 @@ package ru.betterend.blocks.entities; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.fabricmc.fabric.api.registry.FuelRegistry; -import net.fabricmc.fabric.impl.content.registry.FuelRegistryImpl; import net.minecraft.block.BlockState; import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.block.entity.LockableContainerBlockEntity; @@ -19,7 +23,12 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; -import net.minecraft.recipe.*; +import net.minecraft.recipe.BlastingRecipe; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeFinder; +import net.minecraft.recipe.RecipeInputProvider; +import net.minecraft.recipe.RecipeType; +import net.minecraft.recipe.RecipeUnlocker; import net.minecraft.screen.PropertyDelegate; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; @@ -37,10 +46,6 @@ import ru.betterend.client.gui.EndStoneSmelterScreenHandler; import ru.betterend.recipe.builders.AlloyingRecipe; import ru.betterend.registry.EndBlockEntities; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - public class EndStoneSmelterBlockEntity extends LockableContainerBlockEntity implements SidedInventory, RecipeUnlocker, RecipeInputProvider, Tickable { private static final int[] TOP_SLOTS = new int[] { 0, 1 }; diff --git a/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java b/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java index b361096c..1d1856f7 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java +++ b/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java @@ -1,6 +1,13 @@ package ru.betterend.integration.rei; +import java.text.DecimalFormat; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import com.google.common.collect.Lists; + import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; @@ -16,11 +23,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.Items; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.text.DecimalFormat; -import java.util.List; public class REIAlloyingFuelCategory implements RecipeCategory { private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); diff --git a/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelDisplay.java b/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelDisplay.java index d2bd3ac6..40d9edec 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelDisplay.java +++ b/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelDisplay.java @@ -1,14 +1,14 @@ package ru.betterend.integration.rei; -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.RecipeDisplay; -import me.shedaniel.rei.plugin.DefaultPlugin; -import net.minecraft.util.Identifier; -import org.jetbrains.annotations.NotNull; - import java.util.Collections; import java.util.List; +import org.jetbrains.annotations.NotNull; + +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.RecipeDisplay; +import net.minecraft.util.Identifier; + public class REIAlloyingFuelDisplay implements RecipeDisplay { private EntryStack fuel; private int fuelTime; diff --git a/src/main/java/ru/betterend/integration/rei/REIPlugin.java b/src/main/java/ru/betterend/integration/rei/REIPlugin.java index 16e083c2..e4bb29c0 100644 --- a/src/main/java/ru/betterend/integration/rei/REIPlugin.java +++ b/src/main/java/ru/betterend/integration/rei/REIPlugin.java @@ -1,6 +1,5 @@ package ru.betterend.integration.rei; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -10,7 +9,6 @@ import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeHelper; import me.shedaniel.rei.api.plugins.REIPluginV0; import me.shedaniel.rei.plugin.DefaultPlugin; -import me.shedaniel.rei.plugin.fuel.DefaultFuelDisplay; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.impl.content.registry.FuelRegistryImpl; @@ -21,7 +19,6 @@ import net.minecraft.util.Identifier; import ru.betterend.BetterEnd; import ru.betterend.blocks.basis.EndAnvilBlock; import ru.betterend.blocks.basis.EndFurnaceBlock; -import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; import ru.betterend.recipe.builders.AlloyingRecipe; import ru.betterend.recipe.builders.AnvilRecipe; import ru.betterend.recipe.builders.InfusionRecipe; diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_fur.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_fur.png index 3e384e4f948b61b2d915466e6fe244ebd4719d5e..1179db0235af42bf1a006888931ea20dd264dd69 100644 GIT binary patch delta 218 zcmX@g{F-rsWIZzj1A~Sxe=v|@EDmyaVpw-h<|U9L7vK}(3Z%6s{54$o-*)~#%XR;~ zcKwe!_P^-t|Ez2OyPy4cQe83+sDi5`$S;`TKMd4$ii810Q$1ZALnNlI?P?TcHsm;b z$7V;;|JLjx*@wlQhFwPmdKI;Vst0Eo$8#Q*>R delta 438 zcmV;n0ZIPr0mTE58Gi-<001BJ|6u?C0gOpRK~#9!?UK<;lVKFb-+!aa2GymM6*Yo% z7dG*#A}>N1NhxC33~3CJ2pYjBB4V-VMq(i?BG@#d5XK-x=7JP;3RV=YQYi2b_}*XV z-I-gtOS|mi;eF0?zVn>tefbPv4kaz_JaF45n1N%@p(P7}`+sm_5l*D3^aGwx=!xZW zUV6fvX08@6=U&0Vdp?dInY2U};PALl^R(s8nixEVZqZ!d>6h}#&ph@qr=D4^6ybQv zR>ae3%kV0ktky?Ul1O;?jSe+Ek_2y+Ulh&syo1CCXn(C@=!K>Kz4BWnXnhHt^Kdp} z2~MkNq(F_EwtuW8zM%s*WpjAOR#3UxtR=Rtz20T$m{Z;1y3}sgIQM8tKe~{U_?ybd zzCc$|xjSQH6RZX|~R z+4A5gwU~pSV5(YsVjTTg@9o0u6-KKAcefxeTT(mqp)dG%nE3U#NrS0kl#u>b%707*qoM6N<$f);DqxBvhE diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png index 0fdaa8bcf6f84041f385e4ba8cfa3fd59f4d4f40..480c53175cb4567e57e1f109cb39f38d08f7493f 100644 GIT binary patch delta 192 zcmV;x06+he11NQQXaaIt)gKU^7bPGSwc7G@9 zQkYf&K3cHWa>^S(fe|HZQ1KMle1;sGz$>^JFf_d2vFvY+sW~*&qG4;Bk4uvGjdcqa u>i9q61H=P08xWv-Q6elzckj%6cK#1#F#?yI$mFsB0000dA><-ybhNDQ7O*U3IHHE_e#`iouXGQS7 zm-pWLJe=Qo&TGw`p*w?x3%DX?$d<`c?eJOnv3XN&@1kzm^ndQ7a~A`7xT3I@exrRG zQ{T}Pk)~A>Ea0v!JzJ(BEQ5L6TsEFfajwZ^1^nBV5{o8xO!{)_rf2L3ln&?MOUQTy z%~1&z;NOz@3wUFCw!BFUe1Rt}RJ%6h!C|dbL_$R@{zAY8r7ba;D4{!xnNwI#DhTZ0 z{-Jut%jnqyi+}v}kkh*9aFkMvx(TBgGF>IU> zLl3EDYf9_&89Ho?6yZza=?U6xO#OgsU6@Hn27P(ZIe+;t7&XkFqbrM0Ne%4MpTbxH ztx36efL0s*d3fW(n*N05p$5)@Jy6Qup)#5_#1S!Uk$?1E893KW!>X{ujx_pn|B=!d zEy5j@-kd_$y}6#Ps-YolMh=8J=eiK#){3cre{H=wMN3>*nvHTm9GrJU$mxg(73_o+ z=()2G-P#PJq#ZMl|#lo|rs4 z(dZT~b$;H1dqM%%+{O(UG4IN2qLU=(Lu{C{ymZ*>+ zkjBip-i3fI_3sqYy)MBbJW-uPPgXhWmW=hHiuR-$+LE$#h3SeGbbK&lhsyb|T)P2; fNy$tVH{O~*%D3WLRtg^800000NkvXXu0mjf312m5 diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_2.png index 37f580af9850e186def59c5d3ff49d39228078a4..4e8ddf42fda0e3b29234a0311a55e994a7126047 100644 GIT binary patch delta 192 zcmV;x06+hg1_Sg^# uZ1t)e#|K=)eqw*w9*gV2_86)9P5J>|;{v0&y3W-A0000 zB-02ZQN|)MLn85qpv*+1A3`h`Him`Bh78#l_CzMia1@EMiDQLRb5Qu-_}$aFBY69` zd+(fk&OP_DdU9ylkh^QC%u77Jtz+2OLr3iW_q1YW5uMTXwF~4 zU!r>#ky9lwl|U9_MYLtaqWkU~T&t!jCUo4nje)!pxPJ%EKq%Wq%4l8}XWTFnB{W6N z$e|GDS`)Usvtk-Q-l(N*jF#X@NMBxuYXy`kx1002ovPDHLkU;%>ta4(4f diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_3.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_3.png index d641e7032166e129a048ef16e6ecca1182c5c9d9..7ef7a402a34bbaea5aa8cb49ddab1879062515a9 100644 GIT binary patch delta 190 zcmV;v073ti1RY8Rd-}D|)+GXBWVoL)a5T@D#=QHLOcsoyqXg2~>H8O6Kh#zoKMHYz}5)FS4%1lK1A;bc)F)UF`<>1=;lB4S z_nq^7=X~dy*>iYe=*yyG58Vf-TC(@|(2$U>GzPwjCt@cG7=LhdGk*yln#F%;-IThp zoj8SiRT>j=cggl=QL`+8b^Fkf(H!`uP zqqLD@5KUN52K8|<-V~H7}zf=a%~coCje z%k}I8-h_6)MSrt=U>{>e5dHWF{vDV%WwdT#rmT91c1LXOvK{;hnjs-nLPr|Ye-tx% zqHpu=TtByl=B^ailSO-4=jK_H$=_&m@bV146o&F>cVOl&l)%=_8(Pnsl-?{_96UNi zOG-v^Xx@a*AcbH7ox3ozl@7fbv~PndYr^7QwVi2o!hbQiBDO9n!J?KRO+8Rj^{1PA zE0zV^YeMGGq0}r}5@t%MdVfPp-5h94hVxp~ye*?IBffQcaG-tIf$GV3MTBa-Q4NlP zasZUtloa#4fZ7$y?w*(sO-@5x#rTr4aK%f2;E6`bSXhEc!-pPbFZ6|B=%9vk>WTnEG)Kvc)v_VMV?C<>s)0~d?}5~Y#T6E!J9aQp1pS!M8LAd7 zy9ahFImBc%kNP#Cfa;Id?+9;}N}8@@^0cVkM~=kxSyK<4 iV(}WSDYev=lK;(h;#x5uDE$Bc002ovPDHLkU;%>VdN}0( diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_4.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_4.png index bf700a50d28cdf6f93df5cb957f16932ca0f38c8..fd4e837b11ff75d5193056daf7315912a69c27ad 100644 GIT binary patch delta 194 zcmV;z06qVc1=9hL8Gi!+001a04^sdD00DDSM?wIu&K&6g000kAOjJcHko`TM{yDDy zO1l4Y&HwIE7bO4y0CGu0K~xx(J&y|t06_>s{dE5`uNJcqOuQO3NRS63%qRtm@bH0* z_APfByPOXM5!Aww76AA`6&OHAG;MzxT^X%i^)o{Tj5@=8SUa)Ei1Y6q&;k}D?dEI{ wrZL&*vr?)DbXV*(NahD7!g0$H^}C(a2U&vxk-Xsv5&!@I07*qoM6N<$f~xFFmH+?% delta 645 zcmV;00($+^0h0xg8Gix*005AYXf^-<0$NE#K~#9!B~t%O(@_+Ce@3RZFQUw;=oAf< zM2#>KWh@diBocoR%1lK1A;bc)F)W5`$dC=OkH|zBjv`Su*|2ca6bk;qkaU z&UyEod#>qBW8j;3BX+!i0Y{7ZOYm{_9NrlEvS{B!_W`Pw?0@||)US)FS(dI1`_PeK z4(_mZM`Yp`TDP$H4=tO*m+@10R;6KG?k?H>EQ~)XgBg%EatxyRYflDsaVuVA7D4pm zBLsHvf=a%~Sbq`TRm=121ip1uYbcI{$r9SrnEr#7Ed)>WepA+armT91_C##$vK{;h z!#Q}PGVvR&4ql$YpTbZcZ4Ta@E8%tkb64QMJz2D+VICc#IVB@GG;M;ONC*|sv5UD2 zB~WTpQv3T7(wjxI14CuB<%(GMnuLn_L>fKJRyy=%(0{fKx~d6_XVrG3D}&Ak=NhMuU9IdmvB%htFe!tTB`4UPeE0Bqfukhf*@WyHTB4-T{s zJJ2op#-EUdD~5{DiAKX%_(koCeO>@>s`bW%XmaY~D&BA)ug=gAmw_KTsNtN>n@d47 zJ