From 4d024adeecf2646460eacb6494dfb7960d92f683 Mon Sep 17 00:00:00 2001 From: TropheusJ Date: Thu, 13 Jul 2023 04:07:46 -0400 Subject: [PATCH] last cleanup --- .../2e4268d84c4c2ec30809e099f987b3764ee87c64 | 2 +- .../68a2fbe05d2b54e2cd604cec2e8fe5a3636e5605 | 2 - .../c7f996faab14758ec6943aa9a81387391d94a33e | 2 +- .../fa38d5b522e7a4d75b0fa9f0e2387c7cdb9ea73e | 22 +++++------ .../tags/game_events/updates_emissions.json | 10 ----- .../funnel/ExcursionFunnelEmitterBlock.java | 19 +-------- .../client/render/PortalCubedRenderTypes.java | 39 ------------------- .../entity/model/ExcursionFunnelModel.java | 1 - 8 files changed, 15 insertions(+), 82 deletions(-) delete mode 100644 src/generated/resources/.cache/68a2fbe05d2b54e2cd604cec2e8fe5a3636e5605 delete mode 100644 src/generated/resources/data/portalcubed/tags/game_events/updates_emissions.json delete mode 100644 src/main/java/com/fusionflux/portalcubed/client/render/PortalCubedRenderTypes.java diff --git a/src/generated/resources/.cache/2e4268d84c4c2ec30809e099f987b3764ee87c64 b/src/generated/resources/.cache/2e4268d84c4c2ec30809e099f987b3764ee87c64 index 6b9b3efb..e4ab2586 100644 --- a/src/generated/resources/.cache/2e4268d84c4c2ec30809e099f987b3764ee87c64 +++ b/src/generated/resources/.cache/2e4268d84c4c2ec30809e099f987b3764ee87c64 @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-11T15:10:30.5574454 Portal Cubed/Model Definitions +// 1.20.1 2023-07-13T03:59:48.3050869 Portal Cubed/Model Definitions b265092fd37d48c3dc3e071d8f8d1e592c2f982e assets\portalcubed\blockstates\excursion_funnel_emitter.json 74d68e05a705dd20c865925c2496acc0b43aa0f2 assets\portalcubed\blockstates\light_bridge_emitter.json 0dab1fbc9939ad0400bb9b7f53e0024186e854c1 assets\portalcubed\blockstates\light_bridge.json diff --git a/src/generated/resources/.cache/68a2fbe05d2b54e2cd604cec2e8fe5a3636e5605 b/src/generated/resources/.cache/68a2fbe05d2b54e2cd604cec2e8fe5a3636e5605 deleted file mode 100644 index 21456bde..00000000 --- a/src/generated/resources/.cache/68a2fbe05d2b54e2cd604cec2e8fe5a3636e5605 +++ /dev/null @@ -1,2 +0,0 @@ -// 1.20.1 2023-07-11T15:10:30.5429337 Portal Cubed/Tags for minecraft:game_event -b450a8c49738c768f118e6d496065c31bb22bd1b data\portalcubed\tags\game_events\updates_emissions.json diff --git a/src/generated/resources/.cache/c7f996faab14758ec6943aa9a81387391d94a33e b/src/generated/resources/.cache/c7f996faab14758ec6943aa9a81387391d94a33e index 5342a3d7..1901db29 100644 --- a/src/generated/resources/.cache/c7f996faab14758ec6943aa9a81387391d94a33e +++ b/src/generated/resources/.cache/c7f996faab14758ec6943aa9a81387391d94a33e @@ -1,2 +1,2 @@ -// 1.20.1 2023-07-11T15:10:30.5554436 Portal Cubed/minecraft:block Loot Table +// 1.20.1 2023-07-13T03:59:48.3030856 Portal Cubed/minecraft:block Loot Table 980f6f22b3722541f671db3453fc07f4c8f8287a data\portalcubed\loot_tables\blocks\excursion_funnel_emitter.json diff --git a/src/generated/resources/.cache/fa38d5b522e7a4d75b0fa9f0e2387c7cdb9ea73e b/src/generated/resources/.cache/fa38d5b522e7a4d75b0fa9f0e2387c7cdb9ea73e index a6cec4eb..10be46f1 100644 --- a/src/generated/resources/.cache/fa38d5b522e7a4d75b0fa9f0e2387c7cdb9ea73e +++ b/src/generated/resources/.cache/fa38d5b522e7a4d75b0fa9f0e2387c7cdb9ea73e @@ -1,26 +1,26 @@ -// 1.20.1 2023-07-11T15:10:30.5559438 Portal Cubed/minecraft:entity Loot Table +// 1.20.1 2023-07-13T03:59:48.3040859 Portal Cubed/minecraft:entity Loot Table 86318041d1ac315fabfc88090d936e86682580c3 data\portalcubed\loot_tables\entities\jug.json +05125e0bb26b7431648dd726813673f6aeb174ab data\portalcubed\loot_tables\entities\energy_pellet.json +3def4866fc047758973a2fed3167b59e5e847d20 data\portalcubed\loot_tables\entities\computer.json b6b91f589e96c00755552126be8649b5ba0f2aeb data\portalcubed\loot_tables\entities\space_core.json -9a319d32af74012091ff2ebeb7dfc4cc2900c217 data\portalcubed\loot_tables\entities\old_ap_cube.json +8bf3757e35e8778cc4939cfa7cd07ea470de86d7 data\portalcubed\loot_tables\entities\chair.json fd2fc0a38a7350cb98dd9a515cc4616df5f298c8 data\portalcubed\loot_tables\entities\beans.json +9a319d32af74012091ff2ebeb7dfc4cc2900c217 data\portalcubed\loot_tables\entities\old_ap_cube.json +540b3dca3c773a9a73b065daac0a49f61d8c3142 data\portalcubed\loot_tables\entities\fact_core.json 8ec3addaf3236aa2d33881c96dc45bf44984046d data\portalcubed\loot_tables\entities\portal_1_storage_cube.json -fb9d054a28d17044419f7497f273490cd284471b data\portalcubed\loot_tables\entities\mug.json d973ae191dc2028412755414dfd96a6e0f8757a3 data\portalcubed\loot_tables\entities\portal_1_companion_cube.json +fb9d054a28d17044419f7497f273490cd284471b data\portalcubed\loot_tables\entities\mug.json dbe4700abb769c9c200dbfb1a78fec63430eaa79 data\portalcubed\loot_tables\entities\storage_cube.json b3f1f2fbb9c918c62d4e5f6930670c5920b2c690 data\portalcubed\loot_tables\entities\radio.json -57a5e0bf2373e2548dab8077543b9e95e8dd2ad4 data\portalcubed\loot_tables\entities\intelligence_core.json -19cd9ae3c2937208bfa9390163854ab38472f3ef data\portalcubed\loot_tables\entities\curiosity_core.json -df05785c45716c8c5e5ce5f3466f0cfabd94076c data\portalcubed\loot_tables\entities\core_frame.json -d4762018abff4512768063591fcf4c671ed72911 data\portalcubed\loot_tables\entities\companion_cube.json -05125e0bb26b7431648dd726813673f6aeb174ab data\portalcubed\loot_tables\entities\energy_pellet.json -3def4866fc047758973a2fed3167b59e5e847d20 data\portalcubed\loot_tables\entities\computer.json -8bf3757e35e8778cc4939cfa7cd07ea470de86d7 data\portalcubed\loot_tables\entities\chair.json -540b3dca3c773a9a73b065daac0a49f61d8c3142 data\portalcubed\loot_tables\entities\fact_core.json 78f8faf928fd5249f9c3a1c62769d40ae6ddf669 data\portalcubed\loot_tables\entities\hoopy.json 4029f6e0a7b46fcb4d25b368bc35379bc6efa36a data\portalcubed\loot_tables\entities\schrodinger_cube.json f34b72ab48c4137c06c5808efd74ac57b1d16641 data\portalcubed\loot_tables\entities\morality_core.json +19cd9ae3c2937208bfa9390163854ab38472f3ef data\portalcubed\loot_tables\entities\curiosity_core.json +57a5e0bf2373e2548dab8077543b9e95e8dd2ad4 data\portalcubed\loot_tables\entities\intelligence_core.json +df05785c45716c8c5e5ce5f3466f0cfabd94076c data\portalcubed\loot_tables\entities\core_frame.json 40d721cea2d04fde3163f010b62edf39821f5538 data\portalcubed\loot_tables\entities\adventure_core.json d933164c6894e055c25653b6571096682b4864ac data\portalcubed\loot_tables\entities\lil_pineapple.json 00a9a37c5ac20598fa218d93792ed75fb53edc33 data\portalcubed\loot_tables\entities\anger_core.json 2033d3dc9a856d5382e84ae4c17785c6e8fdfbde data\portalcubed\loot_tables\entities\redirection_cube.json +d4762018abff4512768063591fcf4c671ed72911 data\portalcubed\loot_tables\entities\companion_cube.json ce78046a3d102b0d8813dfa698c0533cec58eb02 data\portalcubed\loot_tables\entities\turret.json diff --git a/src/generated/resources/data/portalcubed/tags/game_events/updates_emissions.json b/src/generated/resources/data/portalcubed/tags/game_events/updates_emissions.json deleted file mode 100644 index c95a6801..00000000 --- a/src/generated/resources/data/portalcubed/tags/game_events/updates_emissions.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:block_open", - "minecraft:block_close", - "minecraft:block_place", - "minecraft:block_change", - "minecraft:block_destroy" - ] -} \ No newline at end of file diff --git a/src/main/java/com/fusionflux/portalcubed/blocks/funnel/ExcursionFunnelEmitterBlock.java b/src/main/java/com/fusionflux/portalcubed/blocks/funnel/ExcursionFunnelEmitterBlock.java index fa10d5cf..e4eade77 100644 --- a/src/main/java/com/fusionflux/portalcubed/blocks/funnel/ExcursionFunnelEmitterBlock.java +++ b/src/main/java/com/fusionflux/portalcubed/blocks/funnel/ExcursionFunnelEmitterBlock.java @@ -72,9 +72,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player return InteractionResult.SUCCESS; Direction facing = state.getValue(FACING); TwoByTwo multiblock = TwoByTwoFacingMultiblockBlock.makeMultiblockFromQuadrant(pos, state.getValue(QUADRANT), facing); - // q1 is primary - BlockPos q1 = multiblock.byQuadrant(1); - if (!(level.getBlockEntity(q1) instanceof ExcursionFunnelEmitterBlockEntity emitter)) + if (!(level.getBlockEntity(pos) instanceof ExcursionFunnelEmitterBlockEntity emitter)) return InteractionResult.FAIL; ToggleMode mode = emitter.getToggleMode(); boolean powered = state.getValue(MODE) == mode.on; @@ -82,7 +80,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player emitter.setToggleMode(newToggleMode); // sync with others multiblock.forEach(part -> { - if (part != q1 && level.getBlockEntity(part) instanceof ExcursionFunnelEmitterBlockEntity be) + if (part != pos && level.getBlockEntity(part) instanceof ExcursionFunnelEmitterBlockEntity be) be.setToggleMode(newToggleMode); }); // update emitter @@ -115,19 +113,6 @@ public RenderShape getRenderShape(BlockState state) { return RenderShape.MODEL; } - @SuppressWarnings("deprecation") - @Override - public boolean skipRendering(BlockState state, BlockState adjacentState, Direction direction) { - // this makes the end texture only render on the very end - if (!adjacentState.is(this)) - return false; - Direction facing = state.getValue(FACING); - if (facing != direction) - return false; - Direction adjacentFacing = adjacentState.getValue(FACING); - return adjacentFacing == facing; - } - @SuppressWarnings("deprecation") @Override public void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { diff --git a/src/main/java/com/fusionflux/portalcubed/client/render/PortalCubedRenderTypes.java b/src/main/java/com/fusionflux/portalcubed/client/render/PortalCubedRenderTypes.java deleted file mode 100644 index 692d1550..00000000 --- a/src/main/java/com/fusionflux/portalcubed/client/render/PortalCubedRenderTypes.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.fusionflux.portalcubed.client.render; - -import java.util.function.Function; - -import com.fusionflux.portalcubed.client.render.entity.animated_textures.AnimatedEntityTextures; - -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.VertexFormat; - -import net.minecraft.Util; -import net.minecraft.client.renderer.RenderStateShard; -import net.minecraft.client.renderer.RenderStateShard.TextureStateShard; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.resources.ResourceLocation; - -public class PortalCubedRenderTypes { - private static final Function animatedTranslucentEntityFactory = Util.memoize( - texture -> RenderType.create( - "animated_translucent_entity", - DefaultVertexFormat.NEW_ENTITY, - VertexFormat.Mode.QUADS, - 256, - true, - true, - RenderType.CompositeState.builder() - .setShaderState(RenderStateShard.RENDERTYPE_ENTITY_CUTOUT_NO_CULL_SHADER) - .setTextureState(new TextureStateShard(texture, false, false)) - .setTransparencyState(RenderStateShard.TRANSLUCENT_TRANSPARENCY) - .setCullState(RenderStateShard.NO_CULL) - .setLightmapState(RenderStateShard.LIGHTMAP) - .setOverlayState(RenderStateShard.OVERLAY) - .createCompositeState(true) - ) - ); - - public static RenderType getAnimatedTranslucentEntity(ResourceLocation texture) { - return animatedTranslucentEntityFactory.apply(texture); - } -} diff --git a/src/main/java/com/fusionflux/portalcubed/client/render/entity/model/ExcursionFunnelModel.java b/src/main/java/com/fusionflux/portalcubed/client/render/entity/model/ExcursionFunnelModel.java index 43158642..7e4a41db 100644 --- a/src/main/java/com/fusionflux/portalcubed/client/render/entity/model/ExcursionFunnelModel.java +++ b/src/main/java/com/fusionflux/portalcubed/client/render/entity/model/ExcursionFunnelModel.java @@ -3,7 +3,6 @@ import java.util.Set; import com.fusionflux.portalcubed.PortalCubed; -import com.fusionflux.portalcubed.client.render.PortalCubedRenderTypes; import com.fusionflux.portalcubed.entity.beams.EmittedEntity; import com.fusionflux.portalcubed.entity.beams.ExcursionFunnelEntity;