Skip to content

Commit

Permalink
⬆️ 1.19.3 port
Browse files Browse the repository at this point in the history
  • Loading branch information
LocusAzzurro committed Jun 20, 2023
1 parent 69d4429 commit 179ca86
Show file tree
Hide file tree
Showing 90 changed files with 266 additions and 277 deletions.
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

minecraft_version=1.19.2
minecraft_version_range=[1.19.2,1.19.4)
forge_version=43.2.0
forge_version_range=[43,)
loader_version_range=[43,)
minecraft_version=1.19.3
minecraft_version_range=[1.19.3]
forge_version=44.1.0
forge_version_range=[44,)
loader_version_range=[44,)
mappings_channel=official
mappings_version=1.19.2
mappings_version=1.19.3

mod_id=pyrotechnicraft
mod_name=Pyrotechnicraft
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-06-20T00:33:03.7500868 Block States: pyrotechnicraft
// 1.19.3 2023-06-21T00:29:39.0726577 Block States: pyrotechnicraft
1b2704a1f88f054bfbe0f5efe83f296bc6a9f5d7 assets/pyrotechnicraft/blockstates/composite_firework_orb_launcher_stand.json
0f8af74078302a356965c663d796ead70437ee56 assets/pyrotechnicraft/blockstates/firework_launcher_stand.json
3b2bff2975eccc0c42f772f6999bbbc36ccc4c45 assets/pyrotechnicraft/blockstates/firework_missile_crafting_table.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-06-20T00:33:03.7500868 pyrotechnicraft Item Tags
// 1.19.3 2023-06-21T00:29:39.0746577 pyrotechnicraft Item Tags
1b2b2d7ade8bc1d9416753e0cda18cc7cf9ebca8 data/forge/tags/items/dusts/coal.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forge/tags/items/dusts/diamond.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forge/tags/items/dusts/iron.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-06-20T00:33:03.7487121 pyrotechnicraft Item Models
// 1.19.3 2023-06-21T00:29:39.0766584 pyrotechnicraft Item Models
e7f248b2d2667c34a23694dbf868a93f3dba915e assets/pyrotechnicraft/models/item/2d_explosion_pattern.json
fa19194798f1dd31d7d6fcadade9458997c754a2 assets/pyrotechnicraft/models/item/3d_explosion_pattern.json
002be3c6f48046a16cfd6162a787c7bc7bf07c57 assets/pyrotechnicraft/models/item/burst_explosion_pattern.json
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// 1.19.3 2023-06-21T00:29:39.0746577 Loot Tables
0252994caec71ff7612f432051aaac2cc156847b data/pyrotechnicraft/loot_tables/blocks/composite_firework_orb_launcher_stand.json
12d520c81b5c58ad6e4e6daf6459ab5292c8700c data/pyrotechnicraft/loot_tables/blocks/firework_launcher_stand.json
c8996ce9edfaa445382a2a0a96bc585e663a32a1 data/pyrotechnicraft/loot_tables/blocks/firework_missile_crafting_table.json
79592ffef5813c7798c357a29839cf5ccb0099e6 data/pyrotechnicraft/loot_tables/blocks/firework_orb_crafting_table.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.19.2 2023-06-20T00:33:03.751091 pyrotechnicraft Block Tags
// 1.19.3 2023-06-21T00:29:39.0746577 pyrotechnicraft Block Tags
2c5103cafd2498b05d247b84469869ccf9b57ef3 data/minecraft/tags/blocks/mineable/axe.json
e57dda9981b976cd6e50d607a435479c669e2958 data/minecraft/tags/blocks/mineable/pickaxe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// 1.19.3 2023-06-21T00:29:39.075658 Recipes
c2544c3a5070819f7156b1aa346a0dff03d51013 data/pyrotechnicraft/advancements/recipes/combat/firecracker.json
4f0d62a9014762cee6d7de5a05ba082de1f531ab data/pyrotechnicraft/advancements/recipes/combat/homing_array.json
950240db635ca89da99950e7ead8e82a4a2dd748 data/pyrotechnicraft/advancements/recipes/combat/homing_array_script.json
35e029738417a12813fdacfb1cd43d016949dbc1 data/pyrotechnicraft/advancements/recipes/misc/burst_explosion_pattern.json
8e010ef623c0bf166542e0044adb345523d97155 data/pyrotechnicraft/advancements/recipes/misc/extended_fuse.json
22ed797da3155873377655ebf8610996eba6be89 data/pyrotechnicraft/advancements/recipes/misc/firework_homing_module.json
9f7be55d74568600ddf45e0b6eb20b0edfbe5644 data/pyrotechnicraft/advancements/recipes/misc/firework_mixture.json
302c03931eef42887e1748e6295482d8c9da5eaf data/pyrotechnicraft/advancements/recipes/misc/firework_mixture_with_gunpowder.json
8ccb7c0493fddad89b1ed65fd263a933b31f22bc data/pyrotechnicraft/advancements/recipes/misc/firework_orb_core.json
d845dc16da66ca56eb8398fb81b300dcc0ce5d74 data/pyrotechnicraft/advancements/recipes/misc/firework_orb_core_with_firework_mixture.json
f97dba4834f98e7acda5e50ce78a8e4b399d6ab0 data/pyrotechnicraft/advancements/recipes/misc/firework_orb_core_with_gunpowder.json
874d17ff88546d45112442ce3340a1ef4ecd8512 data/pyrotechnicraft/advancements/recipes/misc/firework_wrapping_paper.json
66f2ceb09e0f317145fad73886cc7337f53ecb4e data/pyrotechnicraft/advancements/recipes/misc/flicker_stick.json
db0db7b53d0ed17480b0cc5d60369a8eb90d8fe0 data/pyrotechnicraft/advancements/recipes/misc/instant_fuse.json
b7daf1e68d2b0fbe977c72add5ee4fcd46fc8a90 data/pyrotechnicraft/advancements/recipes/misc/regular_fuse.json
9685cd19a5119f0e01ef1a90562b4598ddddb65d data/pyrotechnicraft/advancements/recipes/misc/ring_explosion_pattern.json
ed72370f2e6675b86b68568bd674e944614e0a0f data/pyrotechnicraft/advancements/recipes/misc/sphere_explosion_pattern.json
b594a22e3d4253ba484bd5a074f915470b14bfb2 data/pyrotechnicraft/advancements/recipes/tools/firework_launcher.json
c3bc17c5a972fd77e9fccc3e32d9bc709147646f data/pyrotechnicraft/advancements/recipes/tools/firework_missile_crafting_table.json
4573136b7c71f0002a3c6f04ad7e5e0dc7b7b418 data/pyrotechnicraft/advancements/recipes/tools/firework_orb_crafting_table.json
94fc30831805eb39ed85477b5f567b73415abf1c data/pyrotechnicraft/advancements/recipes/tools/firework_orb_shooter.json
69fc0d20f71fab44abba8d28073b6fc23ba379ca data/pyrotechnicraft/recipes/burst_explosion_pattern.json
90f4b1f942d83cc5e2fd9afaf1179b72b6321310 data/pyrotechnicraft/recipes/extended_fuse.json
31e4d20289fea4fa79d9adba35571bc62a1e3a38 data/pyrotechnicraft/recipes/firecracker.json
eef638dde38e7450d9c1ca86a9bc68aca3536192 data/pyrotechnicraft/recipes/firework_homing_module.json
ed78b90aadd93efcf9118bf9be6c0f856abda1f0 data/pyrotechnicraft/recipes/firework_launcher.json
38e4529e427dc5226acec77e90a8625effc51f88 data/pyrotechnicraft/recipes/firework_missile_crafting_table.json
9d403ae6609313670513f293d90d5ca7fcee9f1a data/pyrotechnicraft/recipes/firework_mixture.json
d07b5837515be6c6e74bd5c1608314001b2a4d26 data/pyrotechnicraft/recipes/firework_mixture_with_gunpowder.json
4c52f58510d5b8de450dda070beef49274647cb1 data/pyrotechnicraft/recipes/firework_orb_core.json
6f5df8ea244b2f9d469b6879a078d9ccc057a53b data/pyrotechnicraft/recipes/firework_orb_core_with_firework_mixture.json
89d25b06dd02a3efce6470601beeb751aba45031 data/pyrotechnicraft/recipes/firework_orb_core_with_gunpowder.json
f0baea4f5c71cac201c2482f99721198ca9d8e94 data/pyrotechnicraft/recipes/firework_orb_crafting_table.json
3d3c6bdc6ae872fe87dd3098c202d3b058daab03 data/pyrotechnicraft/recipes/firework_orb_shooter.json
521899b15eb2382dceaa7f10122ee4a3998e2c93 data/pyrotechnicraft/recipes/firework_wrapping_paper.json
98b7faa44d42a9f842ec8bc5de73e8d6a9a2b57d data/pyrotechnicraft/recipes/flicker_stick.json
b1b1338e2c6b5783faa60f173c7eb32607a60916 data/pyrotechnicraft/recipes/homing_array.json
fe54a5da711b3fe029c6e6ceaf14554cd3bcaf10 data/pyrotechnicraft/recipes/homing_array_script.json
2e8d3e297a8f0ba18b98817903d5623e16da2cf5 data/pyrotechnicraft/recipes/instant_fuse.json
38471fe7ca3e72c37e9d6780e2bef1d4b7d958de data/pyrotechnicraft/recipes/regular_fuse.json
000f8407b463a5a296931417cdcd6c7ccf5a7af0 data/pyrotechnicraft/recipes/ring_explosion_pattern.json
48d9c90844bc97b5a15ff95743127cb6f75d3584 data/pyrotechnicraft/recipes/sphere_explosion_pattern.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "pyrotechnicraft:composite_firework_orb_launcher_stand"
}
],
"name": "composite_firework_orb_launcher_stand",
"rolls": 1.0
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "pyrotechnicraft:firework_launcher_stand"
}
],
"name": "firework_launcher_stand",
"rolls": 1.0
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "pyrotechnicraft:firework_missile_crafting_table"
}
],
"name": "firework_missile_crafting_table",
"rolls": 1.0
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "pyrotechnicraft:firework_orb_crafting_table"
}
],
"name": "firework_orb_crafting_table",
"rolls": 1.0
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"B": {
"tag": "minecraft:buttons"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"C": {
"item": "minecraft:crafting_table"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"group": "firework_mixture",
"ingredients": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"group": "firework_mixture",
"ingredients": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"group": "firework_orb_core",
"ingredients": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"group": "firework_orb_core",
"ingredients": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"group": "firework_orb_core",
"ingredients": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"C": {
"item": "minecraft:crafting_table"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"B": {
"item": "minecraft:bamboo"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"C": {
"item": "minecraft:comparator"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shapeless",
"category": "equipment",
"ingredients": [
{
"item": "pyrotechnicraft:firework_homing_module"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"F": {
"item": "pyrotechnicraft:firework_mixture"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
public class Pyrotechnicraft {

public static final String MOD_ID = "pyrotechnicraft";
public static final CreativeTabs.CreativeTab CREATIVE_TAB = new CreativeTabs.CreativeTab();

public Pyrotechnicraft() {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import com.google.common.collect.Lists;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Vector3f;
import com.mojang.math.Axis;
import org.joml.Vector3f;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.culling.Frustum;
import net.minecraft.client.renderer.entity.EntityRenderer;
Expand Down Expand Up @@ -42,8 +43,8 @@ public void render(T entityIn, float entityYaw, float partialTicks, PoseStack ma
super.render(entityIn, entityYaw, partialTicks, matrixStackIn, bufferIn, packedLightIn);
matrixStackIn.pushPose();
matrixStackIn.scale(0.5f,0.5f, 0.5f);
matrixStackIn.mulPose(Vector3f.YN.rotationDegrees(entityIn.getYRot()));
matrixStackIn.mulPose(Vector3f.XN.rotationDegrees(entityIn.getXRot() - 90f));
matrixStackIn.mulPose(Axis.YN.rotationDegrees(entityIn.getYRot()));
matrixStackIn.mulPose(Axis.XN.rotationDegrees(entityIn.getXRot() - 90f));
VertexConsumer vertexBuilder = bufferIn.getBuffer(model.renderType(getTextureLocation(entityIn)));
this.model.renderFireworkMissile(entityIn, matrixStackIn, vertexBuilder, packedLightIn, OverlayTexture.NO_OVERLAY);
for(RenderLayer<T, M> renderLayer : this.layers) {
Expand Down
Loading

0 comments on commit 179ca86

Please sign in to comment.