Skip to content

Commit

Permalink
Release 1.2.0 (#7)
Browse files Browse the repository at this point in the history
* missed data generater stuff

* Dynamite now throwable by dispenser

* Add Spears

* Update items picture

* remove mixin

* fixes with removed mixin

* remove unused stuff

* enchantablity for spear

* cleaning

* added remaining glass types

* update screenshots
  • Loading branch information
TheFusion21 authored Nov 29, 2024
1 parent 26bce39 commit a557cb3
Show file tree
Hide file tree
Showing 538 changed files with 8,846 additions and 261 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ loom {
}
}

accessWidenerPath = file('src/main/resources/vanilla-plus-plus.accesswidener')
}

fabricApi {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3
loader_version=0.16.5

# Mod Properties
mod_version=1.1.0
mod_version=1.2.0
maven_group=com.kayhennig.vanplusplus
archives_base_name=vanilla-plus-plus

Expand Down
Binary file modified screenshots/items.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshots/slabs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshots/vertical_slabs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.kayhennig.vanplusplus;

import com.kayhennig.vanplusplus.entity.ModBlockEntityType;
import com.kayhennig.vanplusplus.block.entity.ModBlockEntityType;
import com.kayhennig.vanplusplus.entity.ModEntityType;
import com.kayhennig.vanplusplus.render.entity.*;

import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.EnvType;
Expand All @@ -17,7 +18,43 @@ public class VanillaplusplusClient implements ClientModInitializer {
public void onInitializeClient() {
// This entrypoint is suitable for setting up client-specific logic, such as rendering.
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.GLASS_SLAB, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.TINTED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.WHITE_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.ORANGE_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.MAGENTA_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LIGHT_BLUE_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.YELLOW_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LIME_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.PINK_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.GRAY_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LIGHT_GRAY_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CYAN_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.PURPLE_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLUE_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BROWN_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.GREEN_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.RED_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLACK_STAINED_GLASS_SLAB, RenderLayer.getTranslucent());

BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.GLASS_VERTICAL_SLAB, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.TINTED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.WHITE_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.ORANGE_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.MAGENTA_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LIGHT_BLUE_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.YELLOW_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LIME_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.PINK_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.GRAY_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LIGHT_GRAY_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CYAN_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.PURPLE_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLUE_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BROWN_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.GREEN_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.RED_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLACK_STAINED_GLASS_VERTICAL_SLAB, RenderLayer.getTranslucent());

BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.GLASS_HORIZONTAL_PANE, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.WHITE_STAINED_GLASS_HORIZONTAL_PANE, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.ORANGE_STAINED_GLASS_HORIZONTAL_PANE, RenderLayer.getTranslucent());
Expand All @@ -35,7 +72,9 @@ public void onInitializeClient() {
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.GREEN_STAINED_GLASS_HORIZONTAL_PANE, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.RED_STAINED_GLASS_HORIZONTAL_PANE, RenderLayer.getTranslucent());
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLACK_STAINED_GLASS_HORIZONTAL_PANE, RenderLayer.getTranslucent());

BlockEntityRendererFactories.register(ModBlockEntityType.SHELF, ShelfBlockEntityRenderer::new);
EntityRendererRegistry.register(ModEntityType.DYNAMITE, DynamiteEntityRenderer::new);
EntityRendererRegistry.register(ModEntityType.SPEAR, SpearEntityRenderer::new);
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.kayhennig.vanplusplus;
package com.kayhennig.vanplusplus.render.entity;

import com.kayhennig.vanplusplus.thrown.DynamiteEntity;
import com.kayhennig.vanplusplus.Vanillaplusplus;
import com.kayhennig.vanplusplus.entity.thrown.DynamiteEntity;

import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.kayhennig.vanplusplus;
package com.kayhennig.vanplusplus.render.entity;

import com.kayhennig.vanplusplus.block.ShelfBlockEntity;
import com.kayhennig.vanplusplus.block.entity.ShelfBlockEntity;

import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.kayhennig.vanplusplus.render.entity;

import com.kayhennig.vanplusplus.Vanillaplusplus;
import com.kayhennig.vanplusplus.entity.projectile.SpearEntity;

import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderer;
import net.minecraft.client.render.entity.EntityRendererFactory;
import net.minecraft.client.render.item.ItemRenderer;
import net.minecraft.client.render.model.json.ModelTransformationMode;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RotationAxis;

@Environment(EnvType.CLIENT)
public class SpearEntityRenderer extends EntityRenderer<SpearEntity> {
private final ItemRenderer itemRenderer;

public SpearEntityRenderer(EntityRendererFactory.Context context) {
super(context);
this.itemRenderer = context.getItemRenderer();
}

public void render(SpearEntity spearEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i) {
matrixStack.push();
matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(MathHelper.lerp(g, spearEntity.prevYaw, spearEntity.getYaw()) - 90.0F));
matrixStack.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(MathHelper.lerp(g, spearEntity.prevPitch, spearEntity.getPitch()) - 45.0F));
this.itemRenderer.renderItem(
spearEntity.getStack(),
ModelTransformationMode.GROUND,
i,
OverlayTexture.DEFAULT_UV,
matrixStack,
vertexConsumerProvider,
spearEntity.getWorld(),
spearEntity.getId()
);
matrixStack.pop();
super.render(spearEntity, f, g, matrixStack, vertexConsumerProvider, i);
}

@Override
public Identifier getTexture(SpearEntity entity) {
// get the texture of the spear
return Identifier.of(Vanillaplusplus.MOD_ID, entity.getStack().getItem().getTranslationKey());
}

}
4 changes: 1 addition & 3 deletions src/client/resources/vanilla-plus-plus.client.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"required": true,
"package": "com.kayhennig.vanplusplus.mixin.client",
"compatibilityLevel": "JAVA_21",
"client": [
"ExampleClientMixin"
],
"client": [],
"injectors": {
"defaultRequire": 1
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// 1.21.1 2024-11-25T18:13:00.3800394 vanilla-plus-plus/Tags for minecraft:block
3abe2b0d7c8d68efd16d964a22b0bf2fad5f5f15 data\minecraft\tags\block\mineable\pickaxe.json
// 1.21.1 2024-11-29T09:56:55.0458144 vanilla-plus-plus/Tags for minecraft:block
787c0b0f7a75348ec8728d98548af1e17d4462ca data\minecraft\tags\block\wall_post_override.json
3abe2b0d7c8d68efd16d964a22b0bf2fad5f5f15 data\minecraft\tags\block\mineable\pickaxe.json
c55a5e50dbf14137e77a2351b3aca677d305a85b data\minecraft\tags\block\slabs.json
f495264194aac7257e23e208f04e54972c768a68 data\vanilla-plus-plus\tags\block\glass_slabs.json
f6bd0d29ec1631b6c1855cd34aec46a14d13414a data\vanilla-plus-plus\tags\block\glass_slabs.json
4378ce7a43ef36879513f084115ea14710a3e54e data\vanilla-plus-plus\tags\block\vertical_slabs.json
787c0b0f7a75348ec8728d98548af1e17d4462ca data\minecraft\tags\block\pressure_plates.json
f495264194aac7257e23e208f04e54972c768a68 data\minecraft\tags\block\impermeable.json
f6bd0d29ec1631b6c1855cd34aec46a14d13414a data\minecraft\tags\block\impermeable.json
fafe74e14753934a3d27f94a9fb0c7b69cad4089 data\minecraft\tags\block\wooden_slabs.json
787c0b0f7a75348ec8728d98548af1e17d4462ca data\minecraft\tags\block\stone_pressure_plates.json
6f54f755978d8d291381d0b30d9b6c598f375b52 data\minecraft\tags\block\needs_iron_tool.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-11-25T18:13:00.3947194 vanilla-plus-plus/Block Loot Tables
// 1.21.1 2024-11-29T09:56:55.0665092 vanilla-plus-plus/Block Loot Tables
1d31caebd7e2b3c522b3c3f12b2f835b0da48d03 data\vanilla-plus-plus\loot_table\blocks\crimson_shelf.json
579a65b40ddb6291e293e7891f14a47a47beee75 data\vanilla-plus-plus\loot_table\blocks\stripped_spruce_log_slab.json
9c455301b6698e045b6f0a2d36d702790ec749cf data\vanilla-plus-plus\loot_table\blocks\birch_log_slab.json
Expand Down Expand Up @@ -96,8 +96,8 @@ c45aad54f82942bfd55fed9eb4f385a22a378813 data\vanilla-plus-plus\loot_table\block
f6af7c9893874dd507920bb9960ca8f6abd1b01c data\vanilla-plus-plus\loot_table\blocks\mossy_stone_brick_vertical_slab.json
135d3625e7693c09480033b571622230f90b1ba0 data\vanilla-plus-plus\loot_table\blocks\tuff_brick_vertical_slab.json
74d8fd8ba8420892268d7da9ecf7df4242f1fac4 data\vanilla-plus-plus\loot_table\blocks\stripped_oak_log_slab.json
ff95f1c5a753f5fb15e2799359067a048207a2bd data\vanilla-plus-plus\loot_table\blocks\mangrove_log_vertical_slab.json
744987525d94151f3ac591d8b06312e7cbebcc63 data\vanilla-plus-plus\loot_table\blocks\warped_stem_slab.json
ff95f1c5a753f5fb15e2799359067a048207a2bd data\vanilla-plus-plus\loot_table\blocks\mangrove_log_vertical_slab.json
b3d4d5978293cb6ba1c1c856e01c74935b61d781 data\vanilla-plus-plus\loot_table\blocks\spruce_log_vertical_slab.json
de4c12d6a4a0f6b38bacf1d326dd3fde08b0cfce data\vanilla-plus-plus\loot_table\blocks\nether_brick_pressure_plate.json
589b3a54e673f282826129734b3a9eec2a9532d0 data\vanilla-plus-plus\loot_table\blocks\cobblestone_vertical_slab.json
Expand Down
Loading

0 comments on commit a557cb3

Please sign in to comment.