From 82e46f6129a88166dfa4af62d5fc47274c4faf47 Mon Sep 17 00:00:00 2001 From: jottyfan Date: Sat, 30 Jan 2021 18:57:29 +0100 Subject: [PATCH] compass direction drills --- gradle.properties | 2 +- .../blockentity/DrillBlockEntity.java | 38 ------------------ .../blockentity/QuickieFabricBlockEntity.java | 6 ++- .../{BlockDrill.java => BlockDrillDown.java} | 10 ++--- .../quickiefabric/blocks/QuickieBlocks.java | 6 ++- .../quickiefabric/init/RegistryManager.java | 30 +++++++++++--- .../assets/quickiefabric/lang/de_de.json | 4 ++ .../assets/quickiefabric/lang/en_us.json | 4 ++ .../textures/block/drillstop.png | Bin 1859 -> 2020 bytes 9 files changed, 49 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java rename src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/{BlockDrill.java => BlockDrillDown.java} (81%) diff --git a/gradle.properties b/gradle.properties index 3db4470..c3b6b0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.1 # Mod Properties - mod_version = 1.16.5.0 + mod_version = 1.16.5.1 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java deleted file mode 100644 index a53d535..0000000 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/DrillBlockEntity.java +++ /dev/null @@ -1,38 +0,0 @@ -package de.jottyfan.minecraft.quickiefabric.blockentity; - -import de.jottyfan.minecraft.quickiefabric.blocks.QuickieBlocks; -import net.minecraft.block.Blocks; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.Tickable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * - * @author jotty - * - */ -public class DrillBlockEntity extends BlockEntity implements Tickable { - - private static final Integer MAXDRILLSTEP = 16; - private Integer drillstep; - - public DrillBlockEntity() { - super(QuickieFabricBlockEntity.DRILL); - drillstep = MAXDRILLSTEP; - } - - @Override - public void tick() { - BlockPos pos = getPos(); - World world = getWorld(); - drillstep--; - if (drillstep < 1) { - drillstep = MAXDRILLSTEP; - BlockPos down = pos.down(); - if (!world.getBlockState(down).isOf(Blocks.BEDROCK) && !world.getBlockState(down).isOf(QuickieBlocks.DRILLSTOP)) { - world.breakBlock(down, true); - } - } - } -} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java index deb55f5..17476ca 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/QuickieFabricBlockEntity.java @@ -11,5 +11,9 @@ public class QuickieFabricBlockEntity { public static BlockEntityType ITEMHOARDER; public static BlockEntityType MONSTERHOARDER; public static BlockEntityType EMPTYLAVAHOARDER; - public static BlockEntityType DRILL; + public static BlockEntityType DRILL_DOWN; + public static BlockEntityType DRILL_EAST; + public static BlockEntityType DRILL_SOUTH; + public static BlockEntityType DRILL_WEST; + public static BlockEntityType DRILL_NORTH; } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrill.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java similarity index 81% rename from src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrill.java rename to src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java index 7d13626..e948f25 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrill.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java @@ -3,7 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks; import java.util.ArrayList; import java.util.List; -import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockDownEntity; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; @@ -19,21 +19,21 @@ import net.minecraft.world.BlockView; * @author jotty * */ -public class BlockDrill extends FallingBlock implements BlockEntityProvider { +public class BlockDrillDown extends FallingBlock implements BlockEntityProvider { - public BlockDrill() { + public BlockDrillDown() { super(FabricBlockSettings.of(Material.STONE).hardness(2.5f)); } @Override public BlockEntity createBlockEntity(BlockView world) { - return new DrillBlockEntity(); + return new DrillBlockDownEntity(); } @Override public List getDroppedStacks(BlockState state, Builder builder) { List list = new ArrayList<>(); - list.add(new ItemStack(QuickieBlocks.DRILL)); + list.add(new ItemStack(QuickieBlocks.DRILL_DOWN)); return list; } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java index c856216..d6bd224 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -19,6 +19,10 @@ public class QuickieBlocks { public static final BlockKelpstack KELPSTACK = new BlockKelpstack(); public static final BlockCottonplant COTTONPLANT = new BlockCottonplant(); public static final BlockSulphor BLOCKSULPHOR = new BlockSulphor(); - public static final BlockDrill DRILL = new BlockDrill(); + public static final BlockDrillDown DRILL_DOWN = new BlockDrillDown(); + public static final BlockDrillEast DRILL_EAST = new BlockDrillEast(); + public static final BlockDrillSouth DRILL_SOUTH = new BlockDrillSouth(); + public static final BlockDrillWest DRILL_WEST = new BlockDrillWest(); + public static final BlockDrillNorth DRILL_NORTH = new BlockDrillNorth(); public static final BlockDrillstop DRILLSTOP = new BlockDrillstop(); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 2651d35..6e4bff0 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -7,7 +7,11 @@ import java.util.function.Supplier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockDownEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockEastEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockNorthEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockSouthEntity; +import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockWestEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.EmptyLavaHoarderBlockEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.ItemHoarderBlockEntity; import de.jottyfan.minecraft.quickiefabric.blockentity.MonsterHoarderBlockEntity; @@ -140,7 +144,11 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.MONSTERHOARDER)); stacks.add(new ItemStack(QuickieBlocks.KELPSTACK)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSULPHOR)); - stacks.add(new ItemStack(QuickieBlocks.DRILL)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_DOWN)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_EAST)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_SOUTH)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_WEST)); + stacks.add(new ItemStack(QuickieBlocks.DRILL_NORTH)); stacks.add(new ItemStack(QuickieBlocks.DRILLSTOP)); }).build(); @@ -172,8 +180,16 @@ public class RegistryManager { QuickieFabricBlockEntity.EMPTYLAVAHOARDER = (BlockEntityType) registerBlockEntity( "emptylavahoarderblockentity", EmptyLavaHoarderBlockEntity::new, QuickieBlocks.EMPTYLAVAHOARDER, QuickieBlocks.LAVAHOARDER); - QuickieFabricBlockEntity.DRILL = (BlockEntityType) registerBlockEntity("drillblockentity", - DrillBlockEntity::new, QuickieBlocks.DRILL); + QuickieFabricBlockEntity.DRILL_DOWN = (BlockEntityType) registerBlockEntity("drillblockdownentity", + DrillBlockDownEntity::new, QuickieBlocks.DRILL_DOWN); + QuickieFabricBlockEntity.DRILL_EAST = (BlockEntityType) registerBlockEntity("drillblockeastentity", + DrillBlockEastEntity::new, QuickieBlocks.DRILL_EAST); + QuickieFabricBlockEntity.DRILL_SOUTH = (BlockEntityType) registerBlockEntity("drillblocksouthentity", + DrillBlockSouthEntity::new, QuickieBlocks.DRILL_SOUTH); + QuickieFabricBlockEntity.DRILL_WEST = (BlockEntityType) registerBlockEntity("drillblockwestentity", + DrillBlockWestEntity::new, QuickieBlocks.DRILL_WEST); + QuickieFabricBlockEntity.DRILL_NORTH = (BlockEntityType) registerBlockEntity("drillblocknorthentity", + DrillBlockNorthEntity::new, QuickieBlocks.DRILL_NORTH); } public static final void registerBlocks() { @@ -191,7 +207,11 @@ public class RegistryManager { registerBlock(QuickieBlocks.KELPSTACK, "kelpstack"); registerBlock(QuickieBlocks.COTTONPLANT, "cottonplant"); registerBlock(QuickieBlocks.BLOCKSULPHOR, "blocksulphor"); - registerBlock(QuickieBlocks.DRILL, "drill"); + registerBlock(QuickieBlocks.DRILL_DOWN, "drill"); + registerBlock(QuickieBlocks.DRILL_EAST, "drilleast"); + registerBlock(QuickieBlocks.DRILL_SOUTH, "drillsouth"); + registerBlock(QuickieBlocks.DRILL_WEST, "drillwest"); + registerBlock(QuickieBlocks.DRILL_NORTH, "drillnorth"); registerBlock(QuickieBlocks.DRILLSTOP, "drillstop"); } diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index c1d5512..811283d 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -53,6 +53,10 @@ "block.quickiefabric.cottonplant": "Baumwollpflanze", "block.quickiefabric.blocksulphor": "Schwefelblock", "block.quickiefabric.drill": "Bohrer", + "block.quickiefabric.drilleast": "Ost-Bohrer", + "block.quickiefabric.drillsouth": "Süd-Bohrer", + "block.quickiefabric.drillwest": "West-Bohrer", + "block.quickiefabric.drillnorth": "Nord-Bohrer", "block.quickiefabric.drillstop": "Bohrerstopper", "container.quickiefabric.backpack": "Rucksack", "msg.buildingplan.start": "beginne Konstruktionsaufnahme bei %s,%s,%s", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index bd77dcc..7956c0d 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -53,6 +53,10 @@ "block.quickiefabric.cottonplant": "cotton plant", "block.quickiefabric.blocksulphor": "block of sulfur", "block.quickiefabric.drill": "drill", + "block.quickiefabric.drilleast": "east drill", + "block.quickiefabric.drillsouth": "south drill", + "block.quickiefabric.drillwest": "west drill", + "block.quickiefabric.drillnorth": "north drill", "block.quickiefabric.drillstop": "drill stopper", "container.quickiefabric.backpack": "backpack", "msg.buildingplan.start": "started recording of construction at %s,%s,%s", diff --git a/src/main/resources/assets/quickiefabric/textures/block/drillstop.png b/src/main/resources/assets/quickiefabric/textures/block/drillstop.png index 04779cda145084cb8c4b79cd9a46eacb2ff22a1b..c223200997b548cfcedf552ea6378223ab66333b 100644 GIT binary patch delta 1985 zcmV;y2R``24&)DzBYy^IdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvcH}k; z{O2ih1OniO<8Xa1H^}i*T%_){+hb=kEnA|v03fOWP^SO$_b`9q#}ch^KBk}{Sp1wi z<%~wM`={$p)~)+_u~*}z-`oR?F2PgwYs_bUM!$b7xO7l??SD7vjBq-FF3CrrOwEi& zeKr#Py!*)=L3$hi zlVa|-Vt%!#-GAtQa_|@}jnVh+vJ3ELIBZ%f%q0dB0hE)qEZ~ax_h`p;DXwI*tpKKh z3I$gsB?cmc95q9k26bw9Rsz=SxO2plxdN!!mn5=sU5L4P(cma54XCkHAS>dG@NEk% zy}I;OO3>U0Q<)%)u;iDQ`EJ5bt}&{GkBIDsmo~sWS$_*NCUWzRX#j-A!ObrRU)TLJ zPrwQg^vlf&8_c$B5yjJkTe1isnCJ1_5kav{)OfMPLAQr7B!IvM5>J6_WR65mI02vx z%UK*3AVA)8gOThIA;2bqN6?Kmk=9)Hy!(-tfR9HUMPQ?n0hV(f{E04sL)nXW-uvLA zPhNdCL4Se^K7mDWsTE(v+1|kpH{}jha+7XXwn%WS_A* zV@A$}ixgLU2_=?PwB!oJTbG0 zoa2ey#LOxqDm=qTKe1_Kv!MV8T_^T~ZtNb&{TMd`Uw?-i{{%TRq5A{KvFY*ww>PM@ zyvmU*gk}^@pISlm4R)Cm{^0D>_`lEJ79@pNE8AAvfRE4yPPVSzQnAzKdRUY5kTeSY zOnOA3~Q8@OHX}#cJKxMVOChJ!xwssoS))0A=n2}rB0zmUz@8wzA zo|1G>j;ecYRpD;7_9oreZ3&9fMxvxN5d2N@>c^5E#u{XY@ zH>^mJ2Eym88dA<&fx|mr9=o2rM@@6F4z2Z=(rIXX?EZN7gN#`80MlW)XogqJGF`je zi(j_T?kym~R+~eYjSBc?1tGeC=_a_*s=EOD>UmQXxnkIU)BBba%#t%)+8vFg3x8hy zdG*rmttIu{fHQR5+&c6#JQL6c&H*OA9GhdW{i9>CX?X#q$8soOTx>&oe4>O>tw)@z zvD1Uu?obV^8zred04dHh!9+PM%b+D)F8}y^OP$S}qsBbUex=ew#HHBlfJZKJ=h*VI z>E>6qr{jQvsBs~TEfMP-Ukvf#1b-r`$i@PPLi^6-+u}<}BOR%n1eUI>fvrW^GiDXh zvhj-u$zIZzyL}~m;1m5FDPBq2v1pp^wm@Y0Lqx4ILi#F6vShP~iPTdA3h3S?3nG6d zWY=mh+YMQ?_PBFXt;k?uw`VPB_+I;-{G0oc580c{Gi?uHzh^fn`JMa=OMk=4Gty(i z+5A)V^?E6EGKf(YE=3imVwX%m!;InE2iV1)=1`hp>)u=s(p0L1vn41DcQ~8xw&e0t zINLssV(&&mPYkco|8XCBl;Ud)VFas=>pN-3TM^Y4k%nl z>3Hprnh8`-+UcknRnpwr_J5?FX{s_J{j_X@J~w*|=<^Ancyg)jNNnYtH|Q={qP^lf z=n4X`8(-Y!yV#eL<`H2zT~W-)koGkg&6~9Moc>>G;><3mWj>rMeyu zVh_Nc4&$mvR989dNmA^o=y@K)u3##rAsYEXqvpaDO-1yuq=L-;I)9~9i|TplepC&! z%ElF#^DqHp^caZ)>Qma+t3sg0ZO5U=!y7x{n@?wpd>ragtZ^hddA6bgSM7eMF`RGt zfyXMl2KhYPWyc?4RD_MgN7FVF97y)N5^BC0XeZ_hTmapE%L}wjdce zdn>l{FU@j*K((Txx_R?+6%DxMp+?=cif_@%#ieSLU#AEa0HTeUii*EDTjR&Z3 z%`e1^YT%`L(JhR3F*ac0Hs3dk?KKb7LF!Ko| TB>pue00000NkvXXu0mjfeCO3@ delta 1805 zcmV+o2lDvj55o?SBYy;3dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O1Y?maHfY z{hw9L5=i)74xi_|9nA9Q0%~iORbBmhb%I>a zC_@{%(Vieg?@Iz8m*pJ*sxv?rkavw9(Lb~Y@Fi__{eY$0FoJUXf$cr`6XMgv`iMxb zAGj$0w4Ckky?=(@+ge>R4v4xfqZIAvj4|k#0lA*T9Gb^%q5Ih)T2M(9kW*Dr8Le>S zk=UKsaOK3E+mwY1LNwCELy8m-HEcn9iBcwGW;E{Nb<|Y{kX59S)-cNv3(tAuoUd@e z%$3nq7|s|&UN(C7@h6RXF9RZ0;lK)U$;e!UF_;@q^nU^&+&A9r1bA;7{pyrINL4Us zC(Hp0Oe!xI+45Iz>B+N3KMT34g2~s-0U*NM7QrCx4J*gmvSZ~%JTq_%ASfYn(MB>D zU~8o!NHJPFAumD3+!*6|_7y8mh8cSkh_Kpe4{oAPAj=qw{P89rhmzISSZkg2Hjs@r zIqi(I&VM=Y#wM4%_QqT9y!XLJpMnl1*x-T>A;gfPM2$VrMi+eyF~*dH5++LUmC!%I zk|pbGvdu309CFO5AbpA{wz%R;D6ym}Raa~i)m2|ZjWso9)J>d+4#JgSCy-r}hKZcw*ek*_FNN1T^QngU+QwL8dSYyW#_l@Lc>rgC!7jCG>@j@U9 z#DBf(TH`b$P22p81K)F=nvG!}L!ZX+9M=}gh$J>k@2B3S>vgJOoE{4cT*XZ*d|_kT zgH2%>W2~^RX-g>+)ii!qmTcNhE$a)^wbKqY3S;_20Ue}-x_XwP9vwbOdN6d$b8yx= z9pQ9o%V>0b<%(X;aqIGBXQ4N9wUVZWQ-Ag;6`xj3x8u(JZrt60M<1>1M7dssVvk#C zgkRyA1+>!O!v2vwud`s6Uj;^QE9o$PUncZ7<#8wJal)H=yp&aVu?Ntl@_t-+UzpK% ziS~U?FG+8_{3x;LWm#Sl={B-af5_Z1O-oOQ`7xvFaB?r49-`oRUg|225tz;4)`^+TVYTR%P5e(k8^pDfaUU~1w> zr5*;a0004nX+uL$Nkc;*aB^>EX@6{G004NLeUUv#!%!53Pg|v0Dh_rKaR^dfv>+R|HHKWNgBq_{W=t_25w7OM^}&bm6d3WDGdh?|>}qKlMxUs7lhvgd7n7KijqQnPCRDN1&JTIF1!53x!|y$XGV;4YMwYk zEEL*UZevz7RN^V(sG@3=@6WibaNgpqmaD9JPyWJiPFq>#I;}w@u!tpy5Fn$963Va; zqg^A#M2gPi9{vHxFOo|pSAPkN91EyGh2;3b|KRs*&HUtqn-q=%oiDciF$@HEfkw@? zzmILZaRLOMfh(=$uhfB=Ptt2GEqVm>ZUYzBElu77E_Zj1(w)-Q(R|?Q{FLr#ZhLUcYjmT7PWRdjJ3cZ%|BB zMN|L)asU878yh7hB|#n@{{R42K|xqULs>*bT1G}&M@L;sN?l7!UQ0_}OiW)*O<+z= zU{6nCQBh)2Qe#t7WK>jZS66&mT76wze_vmKVPSz|V}WF3f@EZZWo3hBXM|~KhHPwy zZEc5cZijDg^aknR0Fwg;EPn|KFBrzsV@3b~0AWc)K~xyiU5)_?Kp_l5gB?NW1m6FQ zU)_F0LQ$K~ZPlYyU{pSU3M2nO7pRA9x(1PRJRyZ3O;me~Y^V!I#PP!sI-@6?jA_Lg vgw>Pipk$zlT-T;NizTyzaE%QV$D=9T)